X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Fipfix-export%2Fflow_report.c;h=760de5f8c66eb35ccf2d892b7249568ff554f860;hb=baa18701b9d54d8924771c25b96bd5d99472b7ad;hp=56a2d16b8d53562e52c304b4d1d2c50049ea74ef;hpb=2dca180db989ea7afacdf4e70cc85e4408557382;p=vpp.git

diff --git a/src/vnet/ipfix-export/flow_report.c b/src/vnet/ipfix-export/flow_report.c
index 56a2d16b8d5..760de5f8c66 100644
--- a/src/vnet/ipfix-export/flow_report.c
+++ b/src/vnet/ipfix-export/flow_report.c
@@ -17,6 +17,7 @@
  */
 #include <vnet/ipfix-export/flow_report.h>
 #include <vnet/api_errno.h>
+#include <vnet/udp/udp.h>
 
 flow_report_main_t flow_report_main;
 
@@ -118,9 +119,6 @@ send_template_packet (flow_report_main_t * frm,
 
   b0 = vlib_get_buffer (vm, bi0);
 
-  /* Initialize the buffer */
-  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
-
   ASSERT (vec_len (fr->rewrite) < vlib_buffer_get_default_data_size (vm));
 
   clib_memcpy_fast (b0->data, fr->rewrite, vec_len (fr->rewrite));
@@ -262,7 +260,8 @@ flow_report_process (vlib_main_t * vm,
   u32 template_bi;
   u32 *to_next;
   int send_template;
-  f64 now;
+  f64 now, wait_time;
+  f64 def_wait_time = 5.0;
   int rv;
   uword event_type;
   uword *event_data = 0;
@@ -278,14 +277,20 @@ flow_report_process (vlib_main_t * vm,
   ip4_lookup_node = vlib_get_node_by_name (vm, (u8 *) "ip4-lookup");
   ip4_lookup_node_index = ip4_lookup_node->index;
 
+  wait_time = def_wait_time;
+
   while (1)
     {
-      vlib_process_wait_for_event_or_clock (vm, 5.0);
+      vlib_process_wait_for_event_or_clock (vm, wait_time);
       event_type = vlib_process_get_events (vm, &event_data);
       vec_reset_length (event_data);
 
+      /* 5s delay by default, possibly reduced by template intervals */
+      wait_time = def_wait_time;
+
       vec_foreach (fr, frm->reports)
       {
+	f64 next_template;
 	now = vlib_time_now (vm);
 
 	/* Need to send a template packet? */
@@ -301,6 +306,11 @@ flow_report_process (vlib_main_t * vm,
 	if (rv < 0)
 	  continue;
 
+	/* decide if template should be sent sooner than current wait time */
+	next_template =
+	  (fr->last_template_sent + frm->template_interval) - now;
+	wait_time = clib_min (wait_time, next_template);
+
 	nf = vlib_get_frame_to_node (vm, ip4_lookup_node_index);
 	nf->n_vectors = 0;
 	to_next = vlib_frame_vector_args (nf);