misc: move to new pool_foreach macros

[vpp.git] / src / vnet / vxlan-gbp / vxlan_gbp_api.c

diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_api.c b/src/vnet/vxlan-gbp/vxlan_gbp_api.c
index 6a87d4d..2cac7f5 100644 (file)
--- a/src/vnet/vxlan-gbp/vxlan_gbp_api.c
+++ b/src/vnet/vxlan-gbp/vxlan_gbp_api.c
@@ -81,7 +81,7 @@ vxlan_gbp_tunnel_mode_decode (vl_api_vxlan_gbp_api_tunnel_mode_t in,
       *out = VXLAN_GBP_TUNNEL_MODE_L3;
       return (0);
     }
-  return (1);
+  return (VNET_API_ERROR_INVALID_VALUE);
 }
 
 static void vl_api_vxlan_gbp_tunnel_add_del_t_handler
@@ -92,6 +92,7 @@ static void vl_api_vxlan_gbp_tunnel_add_del_t_handler
   ip46_address_t src, dst;
   ip46_type_t itype;
   int rv = 0;
+  u32 sw_if_index = ~0;
   u32 fib_index;
 
   itype = ip_address_decode (&mp->tunnel.src, &src);
@@ -135,7 +136,6 @@ static void vl_api_vxlan_gbp_tunnel_add_del_t_handler
       goto out;
     }
 
-  u32 sw_if_index = ~0;
   rv = vnet_vxlan_gbp_tunnel_add_del (&a, &sw_if_index);
 
 out:
@@ -189,10 +189,10 @@ static void vl_api_vxlan_gbp_tunnel_dump_t_handler
   if (~0 == sw_if_index)
     {
       /* *INDENT-OFF* */
-      pool_foreach (t, vxm->tunnels,
-      ({
+      pool_foreach (t, vxm->tunnels)
+       {
         send_vxlan_gbp_tunnel_details(t, reg, mp->context);
-      }));
+      }
       /* *INDENT-ON* */
     }
   else
@@ -229,7 +229,7 @@ setup_message_id_table (api_main_t * am)
 static clib_error_t *
 vxlan_gbp_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \