misc: move to new pool_foreach macros

[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..108b0c0 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>
 
@@ -187,11 +187,10 @@ vxlan_gpe_clear_output_feature_on_all_intfs (vlib_main_t * vm)
   vnet_main_t *vnm = vnet_get_main ();
   vnet_interface_main_t *im = &vnm->interface_main;
 
-  pool_foreach (si, im->sw_interfaces, (
-                                        {
-                                        vxlan_gpe_set_clear_output_feature_on_intf
-                                        (vm, si->sw_if_index, 0);
-                                        }));
+  pool_foreach (si, im->sw_interfaces)
+  {
+    vxlan_gpe_set_clear_output_feature_on_intf (vm, si->sw_if_index, 0);
+  }
   return;
 }
 
@@ -222,7 +221,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 +302,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 +313,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 +335,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);
@@ -379,17 +376,12 @@ vxlan_gpe_refresh_output_feature_on_all_dest (void)
   i = vec_len (hm->bool_ref_by_sw_if_index);
   vec_free (hm->bool_ref_by_sw_if_index);
   vec_validate_init_empty (hm->bool_ref_by_sw_if_index, i, ~0);
-  pool_foreach (t, hm->dst_tunnels, (
-                                     {
-                                     vxlan_gpe_enable_disable_ioam_for_dest
-                                     (hm->vlib_main,
-                                      t->dst_addr,
-                                      t->outer_fib_index,
-                                      (t->fp_proto == FIB_PROTOCOL_IP4), 1
-                                      /* is_add */
-                                     );
-                                     }
-               ));
+  pool_foreach (t, hm->dst_tunnels)
+  {
+    vxlan_gpe_enable_disable_ioam_for_dest
+      (hm->vlib_main, t->dst_addr, t->outer_fib_index,
+       (t->fp_proto == FIB_PROTOCOL_IP4), 1 /* is_add */ );
+  }
   return;
 }
 
@@ -623,16 +615,14 @@ int vxlan_gpe_ioam_disable_for_dest
       return 0;
     }
 
-  pool_foreach (t, hm->dst_tunnels, (
-                                     {
-                                     vxlan_gpe_enable_disable_ioam_for_dest
-                                     (hm->vlib_main,
-                                      t->dst_addr,
-                                      t->outer_fib_index,
-                                      (t->fp_proto ==
-                                       FIB_PROTOCOL_IP4), 1 /* is_add */ );
-                                     }
-               ));
+  pool_foreach (t, hm->dst_tunnels)
+  {
+    vxlan_gpe_enable_disable_ioam_for_dest
+      (hm->vlib_main,
+       t->dst_addr,
+       t->outer_fib_index,
+       (t->fp_proto == FIB_PROTOCOL_IP4), 1 /* is_add */ );
+  }
   vxlan_gpe_clear_output_feature_on_select_intfs ();
   return (0);