c11 safe string handling support

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

diff --git a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
index b42c357..7567f31 100644 (file)
--- a/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/ioam_transit.c
@@ -16,13 +16,12 @@
 #include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
-#include <vnet/ip/udp.h>
+#include <vnet/udp/udp.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h>
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h>
-#include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/ip4_fib.h>
 #include <vnet/fib/fib_entry.h>
 
@@ -108,7 +107,7 @@ vxlan_gpe_transit_ioam (vlib_main_t * vm,
              if (PREDICT_FALSE
                  ((ip0->protocol == IP_PROTOCOL_UDP) &&
                   (clib_net_to_host_u16 (udp_hdr0->dst_port) ==
-                   UDP_DST_PORT_vxlan_gpe)))
+                   UDP_DST_PORT_VXLAN_GPE)))
                {
 
                  /* Check the iOAM header */
@@ -121,7 +120,7 @@ vxlan_gpe_transit_ioam (vlib_main_t * vm,
                      uword *t = NULL;
                      vxlan_gpe_ioam_main_t *hm = &vxlan_gpe_ioam_main;
                      fib_prefix_t key4;
-                     memset (&key4, 0, sizeof (key4));
+                     clib_memset (&key4, 0, sizeof (key4));
                      key4.fp_proto = FIB_PROTOCOL_IP4;
                      key4.fp_addr.ip4.as_u32 = ip0->dst_address.as_u32;
                      t = hash_get_mem (hm->dst_by_ip4, &key4);