Remove unused argument to vlib_feature_next

[vpp.git] / src / plugins / flowprobe / node.c

diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c
index c4610a7..34f50aa 100644 (file)
--- a/src/plugins/flowprobe/node.c
+++ b/src/plugins/flowprobe/node.c
@@ -73,7 +73,7 @@ format_flowprobe_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   flowprobe_trace_t *t = va_arg (*args, flowprobe_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s,
              "FLOWPROBE[%s]: rx_sw_if_index %d, tx_sw_if_index %d, "
@@ -289,10 +289,13 @@ flowprobe_hash (flowprobe_key_t * k)
   u32 h = 0;
 
 #ifdef clib_crc32c_uses_intrinsics
-  h = clib_crc32c ((u8 *) k->as_u32, FLOWPROBE_KEY_IN_U32);
+  h = clib_crc32c ((u8 *) k, sizeof (*k));
 #else
-  u64 tmp =
-    k->as_u32[0] ^ k->as_u32[1] ^ k->as_u32[2] ^ k->as_u32[3] ^ k->as_u32[4];
+  int i;
+  u64 tmp = 0;
+  for (i = 0; i < sizeof (*k) / 8; i++)
+    tmp ^= ((u64 *) k)[i];
+
   h = clib_xxhash (tmp);
 #endif
 
@@ -370,7 +373,7 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
   ethernet_header_t *eth = vlib_buffer_get_current (b);
   u16 ethertype = clib_net_to_host_u16 (eth->type);
   /* *INDENT-OFF* */
-  flowprobe_key_t k = { {0} };
+  flowprobe_key_t k = {};
   /* *INDENT-ON* */
   ip4_header_t *ip4 = 0;
   ip6_header_t *ip6 = 0;
@@ -472,6 +475,7 @@ add_to_flow_record_state (vlib_main_t * vm, vlib_node_runtime_t * node,
          if (e->packetcount)
            flowprobe_export_entry (vm, e);
          e->key = k;
+         e->flow_start = timestamp;
          vlib_node_increment_counter (vm, node->node_index,
                                       FLOWPROBE_ERROR_COLLISION, 1);
        }
@@ -653,7 +657,8 @@ flowprobe_get_buffer (vlib_main_t * vm, flowprobe_variant_t which)
 
       b0->current_data = 0;
       b0->current_length = flowprobe_get_headersize ();
-      b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT);
+      b0->flags |=
+       (VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_F_FLOW_REPORT);
       vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0;
       vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index;
       fm->context[which].next_record_offset_per_worker[my_cpu_number] =
@@ -769,16 +774,14 @@ flowprobe_node_fn (vlib_main_t * vm,
          b0 = vlib_get_buffer (vm, bi0);
          b1 = vlib_get_buffer (vm, bi1);
 
-         vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-                            &next0, b0);
-         vnet_feature_next (vnet_buffer (b1)->sw_if_index[VLIB_TX],
-                            &next1, b1);
+         vnet_feature_next (&next0, b0);
+         vnet_feature_next (&next1, b1);
 
          len0 = vlib_buffer_length_in_chain (vm, b0);
          ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
          u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
 
-         if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+         if (PREDICT_TRUE ((b0->flags & VNET_BUFFER_F_FLOW_REPORT) == 0))
            add_to_flow_record_state (vm, node, fm, b0, timestamp, len0,
                                      flowprobe_get_variant
                                      (which, fm->context[which].flags,
@@ -788,7 +791,7 @@ flowprobe_node_fn (vlib_main_t * vm,
          ethernet_header_t *eh1 = vlib_buffer_get_current (b1);
          u16 ethertype1 = clib_net_to_host_u16 (eh1->type);
 
-         if (PREDICT_TRUE ((b1->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+         if (PREDICT_TRUE ((b1->flags & VNET_BUFFER_F_FLOW_REPORT) == 0))
            add_to_flow_record_state (vm, node, fm, b1, timestamp, len1,
                                      flowprobe_get_variant
                                      (which, fm->context[which].flags,
@@ -817,14 +820,13 @@ flowprobe_node_fn (vlib_main_t * vm,
 
          b0 = vlib_get_buffer (vm, bi0);
 
-         vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_TX],
-                            &next0, b0);
+         vnet_feature_next (&next0, b0);
 
          len0 = vlib_buffer_length_in_chain (vm, b0);
          ethernet_header_t *eh0 = vlib_buffer_get_current (b0);
          u16 ethertype0 = clib_net_to_host_u16 (eh0->type);
 
-         if (PREDICT_TRUE ((b0->flags & VLIB_BUFFER_FLOW_REPORT) == 0))
+         if (PREDICT_TRUE ((b0->flags & VNET_BUFFER_F_FLOW_REPORT) == 0))
            {
              flowprobe_trace_t *t = 0;
              if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)