L2 BD: introduce a BD interface on which to send UU packets

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

diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
index 918a982..ac3e178 100644 (file)
--- a/src/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
@@ -120,14 +120,6 @@ format_vxlan_gpe_name (u8 * s, va_list * args)
   return format (s, "vxlan_gpe_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;
-}
-
 /**
  * @brief CLI function for VXLAN GPE admin up/down
  *
@@ -154,7 +146,6 @@ VNET_DEVICE_CLASS (vxlan_gpe_device_class,static) = {
   .name = "VXLAN_GPE",
   .format_device_name = format_vxlan_gpe_name,
   .format_tx_trace = format_vxlan_gpe_encap_trace,
-  .tx_function = dummy_interface_tx,
   .admin_up_down_function = vxlan_gpe_interface_admin_up_down,
 };
 /* *INDENT-ON* */
@@ -465,12 +456,6 @@ mcast_shared_remove (ip46_address_t * remote)
   hash_unset_mem_free (&vxlan_gpe_main.mcast_shared, remote);
 }
 
-static inline fib_protocol_t
-fib_ip_proto (bool is_ip6)
-{
-  return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-}
-
 /**
  * @brief Add or Del a VXLAN GPE tunnel
  *
@@ -600,9 +585,12 @@ int vnet_vxlan_gpe_add_del_tunnel
            (vnm, vxlan_gpe_device_class.index, t - ngm->tunnels,
             vxlan_gpe_hw_class.index, t - ngm->tunnels);
          hi = vnet_get_hw_interface (vnm, hw_if_index);
-         hi->output_node_index = vxlan_gpe_encap_node.index;
        }
 
+      /* Set vxlan-gpe tunnel output node */
+      u32 encap_index = vxlan_gpe_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;
       vec_validate_init_empty (ngm->tunnel_index_by_sw_if_index, sw_if_index,
@@ -620,7 +608,6 @@ int vnet_vxlan_gpe_add_del_tunnel
                                   VNET_SW_INTERFACE_FLAG_ADMIN_UP);
       fib_node_init (&t->node, FIB_NODE_TYPE_VXLAN_GPE_TUNNEL);
       fib_prefix_t tun_remote_pfx;
-      u32 encap_index = vxlan_gpe_encap_node.index;
       vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
 
       fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx);
@@ -644,8 +631,8 @@ int vnet_vxlan_gpe_add_del_tunnel
       else
        {
          /* Multicast tunnel -
-          * as the same mcast group can be used for mutiple mcast tunnels
-          * with different VNIs, create the output fib adjecency only if
+          * as the same mcast group can be used for multiple mcast tunnels
+          * with different VNIs, create the output fib adjacency only if
           * it does not already exist
           */
          fib_protocol_t fp = fib_ip_proto (is_ip6);
@@ -711,9 +698,6 @@ int vnet_vxlan_gpe_add_del_tunnel
          flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER;
        }
 
-      /* Set vxlan tunnel output node */
-      hi->output_node_index = encap_index;
-
       vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class =
        flood_class;
     }
@@ -729,8 +713,8 @@ int vnet_vxlan_gpe_add_del_tunnel
       vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */ );
       vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, t->sw_if_index);
       si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
-      set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0,
-                      0);
+      set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+                      L2_BD_PORT_TYPE_NORMAL, 0, 0);
       vec_add1 (ngm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
 
       ngm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
@@ -988,7 +972,7 @@ done:
  * center or be separated geographically as long as they are reachable
  * through the underlay L3 network.
  *
- * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE sengment.
+ * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE segment.
  *
  * @cliexpar
  * Example of how to create a VXLAN-GPE Tunnel:
@@ -1146,7 +1130,7 @@ set_ip4_vxlan_gpe_bypass (vlib_main_t * vm,
  *                                 ip4-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
@@ -1203,7 +1187,7 @@ set_ip6_vxlan_gpe_bypass (vlib_main_t * vm,
  *                                 ip6-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...