fib: fib api updates

[vpp.git] / src / vnet / geneve / geneve.c

diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c
index 6bc4b67..b0c17e2 100644 (file)
--- a/src/vnet/geneve/geneve.c
+++ b/src/vnet/geneve/geneve.c
@@ -37,6 +37,18 @@
 
 geneve_main_t geneve_main;
 
+u8 *
+format_geneve_encap_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  geneve_encap_trace_t *t = va_arg (*args, geneve_encap_trace_t *);
+
+  s = format (s, "GENEVE encap to geneve_tunnel%d vni %d",
+             t->tunnel_index, t->vni);
+  return s;
+}
+
 static u8 *
 format_decap_next (u8 * s, va_list * args)
 {
@@ -82,14 +94,6 @@ format_geneve_name (u8 * s, va_list * args)
   return format (s, "geneve_tunnel%d", dev_instance);
 }
 
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-                   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
 static clib_error_t *
 geneve_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
 {
@@ -105,7 +109,6 @@ VNET_DEVICE_CLASS (geneve_device_class, static) = {
   .name = "GENEVE",
   .format_device_name = format_geneve_name,
   .format_tx_trace = format_geneve_encap_trace,
-  .tx_function = dummy_interface_tx,
   .admin_up_down_function = geneve_interface_admin_up_down,
 };
 /* *INDENT-ON* */
@@ -360,12 +363,6 @@ mcast_shared_remove (ip46_address_t * remote)
   hash_unset_mem_free (&geneve_main.mcast_shared, remote);
 }
 
-static inline fib_protocol_t
-fib_ip_proto (bool is_ip6)
-{
-  return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-}
-
 int vnet_geneve_add_del_tunnel
   (vnet_geneve_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
 {
@@ -410,7 +407,7 @@ int vnet_geneve_add_del_tunnel
        return VNET_API_ERROR_INVALID_DECAP_NEXT;
 
       pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      memset (t, 0, sizeof (*t));
+      clib_memset (t, 0, sizeof (*t));
 
       /* copy from arg structure */
 #define _(x) t->x = a->x;
@@ -465,6 +462,11 @@ int vnet_geneve_add_del_tunnel
          hi = vnet_get_hw_interface (vnm, hw_if_index);
        }
 
+      /* Set geneve tunnel output node */
+      u32 encap_index = !is_ip6 ?
+       geneve4_encap_node.index : geneve6_encap_node.index;
+      vnet_set_interface_output_node (vnm, hw_if_index, encap_index);
+
       t->hw_if_index = hw_if_index;
       t->sw_if_index = sw_if_index = hi->sw_if_index;
 
@@ -484,8 +486,6 @@ int vnet_geneve_add_del_tunnel
 
       fib_node_init (&t->node, FIB_NODE_TYPE_GENEVE_TUNNEL);
       fib_prefix_t tun_remote_pfx;
-      u32 encap_index = !is_ip6 ?
-       geneve4_encap_node.index : geneve6_encap_node.index;
       vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
 
       fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx);
@@ -524,8 +524,9 @@ int vnet_geneve_add_del_tunnel
                .frp_addr = zero_addr,
                .frp_sw_if_index = 0xffffffff,
                .frp_fib_index = ~0,
-               .frp_weight = 0,
+               .frp_weight = 1,
                .frp_flags = FIB_ROUTE_PATH_LOCAL,
+               .frp_mitf_flags = MFIB_ITF_FLAG_FORWARD,
              };
              const mfib_prefix_t mpfx = {
                .fp_proto = fp,
@@ -539,17 +540,14 @@ int vnet_geneve_add_del_tunnel
               *  - the accepting interface is that from the API
               */
              mfib_table_entry_path_update (t->encap_fib_index,
-                                           &mpfx,
-                                           MFIB_SOURCE_GENEVE,
-                                           &path, MFIB_ITF_FLAG_FORWARD);
+                                           &mpfx, MFIB_SOURCE_GENEVE, &path);
 
              path.frp_sw_if_index = a->mcast_sw_if_index;
              path.frp_flags = FIB_ROUTE_PATH_FLAG_NONE;
+             path.frp_mitf_flags = MFIB_ITF_FLAG_ACCEPT;
              mfei = mfib_table_entry_path_update (t->encap_fib_index,
                                                   &mpfx,
-                                                  MFIB_SOURCE_GENEVE,
-                                                  &path,
-                                                  MFIB_ITF_FLAG_ACCEPT);
+                                                  MFIB_SOURCE_GENEVE, &path);
 
              /*
               * Create the mcast adjacency to send traffic to the group
@@ -576,9 +574,6 @@ int vnet_geneve_add_del_tunnel
          flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER;
        }
 
-      /* Set geneve tunnel output node */
-      hi->output_node_index = encap_index;
-
       vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class =
        flood_class;
     }
@@ -596,8 +591,8 @@ int vnet_geneve_add_del_tunnel
       si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
 
       /* make sure tunnel is removed from l2 bd or xconnect */
-      set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0,
-                      0);
+      set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+                      L2_BD_PORT_TYPE_NORMAL, 0, 0);
       vec_add1 (vxm->free_geneve_tunnel_hw_if_indices, t->hw_if_index);
 
       vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
@@ -626,6 +621,17 @@ int vnet_geneve_add_del_tunnel
   if (sw_if_indexp)
     *sw_if_indexp = sw_if_index;
 
+  if (a->is_add)
+    {
+      /* register udp ports */
+      if (!is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_geneve, 1))
+       udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_geneve,
+                              geneve4_input_node.index, 1);
+      if (is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_geneve6, 0))
+       udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_geneve6,
+                              geneve6_input_node.index, 0);
+    }
+
   return 0;
 }
 
@@ -685,8 +691,8 @@ geneve_add_del_tunnel_command_fn (vlib_main_t * vm,
   clib_error_t *error = NULL;
 
   /* Cant "universally zero init" (={0}) due to GCC bug 53119 */
-  memset (&local, 0, sizeof local);
-  memset (&remote, 0, sizeof remote);
+  clib_memset (&local, 0, sizeof local);
+  clib_memset (&remote, 0, sizeof remote);
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
@@ -822,7 +828,7 @@ geneve_add_del_tunnel_command_fn (vlib_main_t * vm,
       goto done;
     }
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
 
   a->is_add = is_add;
   a->is_ip6 = ipv6_set;
@@ -1118,11 +1124,6 @@ geneve_init (vlib_main_t * vm)
                                       sizeof (ip46_address_t),
                                       sizeof (mcast_shared_t));
 
-  udp_register_dst_port (vm, UDP_DST_PORT_geneve,
-                        geneve4_input_node.index, /* is_ip4 */ 1);
-  udp_register_dst_port (vm, UDP_DST_PORT_geneve6,
-                        geneve6_input_node.index, /* is_ip4 */ 0);
-
   fib_node_register_type (FIB_NODE_TYPE_GENEVE_TUNNEL, &geneve_vft);
 
   return 0;