c11 safe string handling support

[vpp.git] / src / plugins / ioam / lib-vxlan-gpe / vxlan_gpe_ioam.c

diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
index 88d7d20..5a59e75 100644 (file)
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
@@ -16,7 +16,7 @@
 #include <vnet/vxlan-gpe/vxlan_gpe_packet.h>
 #include <vnet/ip/format.h>
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
-#include <vnet/fib/ip6_fib.h>
+#include <vnet/dpo/load_balance.h>
 #include <vnet/fib/ip4_fib.h>
 #include <vnet/fib/fib_entry.h>
 
@@ -222,7 +222,7 @@ vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
 
   if (is_ipv4)
     {
-      memset (&fib_prefix, 0, sizeof (fib_prefix_t));
+      clib_memset (&fib_prefix, 0, sizeof (fib_prefix_t));
       fib_prefix.fp_len = 32;
       fib_prefix.fp_proto = FIB_PROTOCOL_IP4;
       fib_prefix.fp_addr = dst_addr;
@@ -303,7 +303,7 @@ vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
       vxlan_gpe_ioam_dest_tunnels_t *t1;
       fib_prefix_t key4, *key4_copy;
       hash_pair_t *hp;
-      memset (&key4, 0, sizeof (key4));
+      clib_memset (&key4, 0, sizeof (key4));
       key4.fp_proto = FIB_PROTOCOL_IP4;
       key4.fp_addr.ip4.as_u32 = fib_prefix.fp_addr.ip4.as_u32;
       t = hash_get_mem (hm->dst_by_ip4, &key4);
@@ -314,7 +314,7 @@ vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
              return 0;
            }
          pool_get_aligned (hm->dst_tunnels, t1, CLIB_CACHE_LINE_BYTES);
-         memset (t1, 0, sizeof (*t1));
+         clib_memset (t1, 0, sizeof (*t1));
          t1->fp_proto = FIB_PROTOCOL_IP4;
          t1->dst_addr.ip4.as_u32 = fib_prefix.fp_addr.ip4.as_u32;
          key4_copy = clib_mem_alloc (sizeof (*key4_copy));
@@ -336,9 +336,7 @@ vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
          t1->fib_entry_index =
            fib_table_entry_special_add (outer_fib_index,
                                         &tun_dst_pfx,
-                                        FIB_SOURCE_RR,
-                                        FIB_ENTRY_FLAG_NONE,
-                                        ADJ_INDEX_INVALID);
+                                        FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE);
          t1->sibling_index =
            fib_entry_child_add (t1->fib_entry_index,
                                 hm->fib_entry_type, t1 - hm->dst_tunnels);