MAP: Use explicit address/prefix types in API

[vpp.git] / src / plugins / ioam / analyse / ioam_summary_export.c

diff --git a/src/plugins/ioam/analyse/ioam_summary_export.c b/src/plugins/ioam/analyse/ioam_summary_export.c
index afda309..c16e839 100644 (file)
--- a/src/plugins/ioam/analyse/ioam_summary_export.c
+++ b/src/plugins/ioam/analyse/ioam_summary_export.c
@@ -21,7 +21,9 @@
 u8 *
 ioam_template_rewrite (flow_report_main_t * frm, flow_report_t * fr,
                       ip4_address_t * collector_address,
-                      ip4_address_t * src_address, u16 collector_port)
+                      ip4_address_t * src_address, u16 collector_port,
+                      ipfix_report_element_t * elts,
+                      u32 n_elts, u32 * stream_index)
 {
   ip4_header_t *ip;
   udp_header_t *udp;
@@ -114,7 +116,10 @@ ioam_template_rewrite (flow_report_main_t * frm, flow_report_t * fr,
 
   /* Add ioamPathMap manually */
   f->e_id_length = ipfix_e_id_length (0 /* enterprise */ ,
-                                     ioamPathMap, (1 * sizeof (ioam_path)));
+                                     ioamPathMap,
+                                     (sizeof (ioam_path) +
+                                      (sizeof (ioam_path_map_t) *
+                                       IOAM_TRACE_MAX_NODES)));
   f++;
 
   /* Back to the template packet... */
@@ -145,7 +150,7 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr,
                               ip6_address_t * src, ip6_address_t * dst,
                               u16 src_port, u16 dst_port)
 {
-  while (__sync_lock_test_and_set (record->writer_lock, 1))
+  while (clib_atomic_test_and_set (record->writer_lock))
     ;
 
   int field_index = 0;
@@ -229,8 +234,9 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr,
 
          path->pkt_counter = trace->pkt_counter - trace_cached->pkt_counter;
          path->pkt_counter = clib_host_to_net_u32 (path->pkt_counter);
+         offset += sizeof (ioam_path);
 
-         for (j = 0; j < IOAM_TRACE_MAX_NODES; j++)
+         for (j = 0; j < trace->num_nodes; j++)
            {
              path->path[j].node_id =
                clib_host_to_net_u32 (trace->path[j].node_id);
@@ -238,9 +244,11 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr,
                clib_host_to_net_u16 (trace->path[j].ingress_if);
              path->path[j].egress_if =
                clib_host_to_net_u16 (trace->path[j].egress_if);
+             path->path[j].state_up = trace->path[j].state_up;
            }
 
-         offset += sizeof (ioam_path);
+         //offset += (sizeof(ioam_path_map_t) * trace->num_nodes);
+         offset += (sizeof (ioam_path_map_t) * IOAM_TRACE_MAX_NODES);  //FIXME
        }
     }
 
@@ -251,7 +259,7 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr,
   *(record->chached_data_list) = *record;
   record->chached_data_list->chached_data_list = NULL;
 
-  *(record->writer_lock) = 0;
+  clib_atomic_release (record->writer_lock);
   return offset;
 }
 
@@ -280,7 +288,7 @@ ioam_send_flows (flow_report_main_t * frm, flow_report_t * fr,
 
   stream = &frm->streams[fr->stream_index];
 
-  memset (&temp, 0, sizeof (ip6_address_t));
+  clib_memset (&temp, 0, sizeof (ip6_address_t));
 
   aggregated_data = ioam_analyser_main.aggregated_data;
   data_len = vec_len (aggregated_data);
@@ -392,14 +400,15 @@ ioam_flow_create (u8 del)
   int rv;
   u32 domain_id = 0;
   flow_report_main_t *frm = &flow_report_main;
+  u16 template_id;
 
-  memset (&args, 0, sizeof (args));
+  clib_memset (&args, 0, sizeof (args));
   args.rewrite_callback = ioam_template_rewrite;
   args.flow_data_callback = ioam_send_flows;
   del ? (args.is_add = 0) : (args.is_add = 1);
   args.domain_id = domain_id;
 
-  rv = vnet_flow_report_add_del (frm, &args);
+  rv = vnet_flow_report_add_del (frm, &args, &template_id);
 
   switch (rv)
     {