[aarch64] Fixes CLI crashes on dpaa2 platform.

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

diff --git a/src/plugins/flowprobe/node.c b/src/plugins/flowprobe/node.c
index 604a0a0..1c77860 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);
        }
@@ -971,9 +975,9 @@ flowprobe_walker_process (vlib_main_t * vm,
      * entry. Otherwise restart timer with what's left
      * Premature passive timer by more than 10%
      */
-    if ((now - e->last_updated) < (fm->passive_timer * 0.9))
+    if ((now - e->last_updated) < (u64) (fm->passive_timer * 0.9))
       {
-       f64 delta = fm->passive_timer - (now - e->last_updated);
+       u64 delta = fm->passive_timer - (now - e->last_updated);
        e->passive_timer_handle = tw_timer_start_2t_1w_2048sl
          (fm->timers_per_worker[cpu_index], *i, 0, delta);
       }