VPP-257 Coding standards cleanup for vnet/vnet/l2

[vpp.git] / vnet / vnet / vxlan-gpe / vxlan_gpe.c

diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/vnet/vnet/vxlan-gpe/vxlan_gpe.c
index 74518bf..f54d46c 100644 (file)
--- a/vnet/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/vnet/vnet/vxlan-gpe/vxlan_gpe.c
@@ -24,8 +24,8 @@ u8 * format_vxlan_gpe_tunnel (u8 * s, va_list * args)
 
   s = format (s, "[%d] local: %U remote: %U ",
               t - gm->tunnels,
-              format_ip46_address, &t->local,
-              format_ip46_address, &t->remote);
+              format_ip46_address, &t->local, IP46_TYPE_ANY,
+              format_ip46_address, &t->remote, IP46_TYPE_ANY);
 
   s = format (s, "  vxlan VNI %d ", t->vni);
 
@@ -116,8 +116,7 @@ VNET_HW_INTERFACE_CLASS (vxlan_gpe_hw_class) = {
 _(vni)                                          \
 _(protocol)                                \
 _(encap_fib_index)                              \
-_(decap_fib_index)                              \
-_(decap_next_index)
+_(decap_fib_index)
 
 #define foreach_copy_ipv4 {                     \
   _(local.ip4.as_u32)                           \
@@ -249,9 +248,6 @@ int vnet_vxlan_gpe_add_del_tunnel
       if (p)
         return VNET_API_ERROR_INVALID_VALUE;
 
-      if (a->decap_next_index >= VXLAN_GPE_INPUT_N_NEXT)
-        return VNET_API_ERROR_INVALID_DECAP_NEXT;
-
       pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
       memset (t, 0, sizeof (*t));
 
@@ -312,6 +308,8 @@ int vnet_vxlan_gpe_add_del_tunnel
 
       t->hw_if_index = hw_if_index;
       t->sw_if_index = sw_if_index = hi->sw_if_index;
+      vec_validate_init_empty (gm->tunnel_index_by_sw_if_index, sw_if_index, ~0);
+      gm->tunnel_index_by_sw_if_index[sw_if_index] = t - gm->tunnels;
 
       vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
                                    VNET_SW_INTERFACE_FLAG_ADMIN_UP);
@@ -327,6 +325,8 @@ int vnet_vxlan_gpe_add_del_tunnel
       vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */);
       vec_add1 (gm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
 
+      gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
+
       if (!a->is_ip6)
       {
         hp = hash_get_pair (gm->vxlan4_gpe_tunnel_by_key, &key4);
@@ -376,26 +376,6 @@ static u32 fib6_index_from_fib_id (u32 fib_id)
   return p[0];
 }
 
-static uword unformat_gpe_decap_next (unformat_input_t * input, va_list * args)
-{
-  u32 * result = va_arg (*args, u32 *);
-  u32 tmp;
-
-  if (unformat (input, "drop"))
-    *result = VXLAN_GPE_INPUT_NEXT_DROP;
-  else if (unformat (input, "ip4"))
-    *result = VXLAN_GPE_INPUT_NEXT_IP4_INPUT;
-  else if (unformat (input, "ip6"))
-    *result = VXLAN_GPE_INPUT_NEXT_IP6_INPUT;
-  else if (unformat (input, "ethernet"))
-    *result = VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT;
-  else if (unformat (input, "%d", &tmp))
-    *result = tmp;
-  else
-    return 0;
-  return 1;
-}
-
 static clib_error_t *
 vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm,
                                    unformat_input_t * input,
@@ -411,7 +391,6 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm,
   u32 encap_fib_index = 0;
   u32 decap_fib_index = 0;
   u8 protocol = VXLAN_GPE_PROTOCOL_IP4;
-  u32 decap_next_index = VXLAN_GPE_INPUT_NEXT_IP4_INPUT;
   u32 vni;
   u8 vni_set = 0;
   int rv;
@@ -471,9 +450,6 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm,
         if (decap_fib_index == ~0)
           return clib_error_return (0, "nonexistent decap fib id %d", tmp);
       }
-    else if (unformat (line_input, "decap-next %U", unformat_gpe_decap_next,
-                       &decap_next_index))
-      ;
     else if (unformat (line_input, "vni %d", &vni))
       vni_set = 1;
     else if (unformat(line_input, "next-ip4"))