From 8a0a0ae60b8dd9da7cf53c895e85dc6daf67143d Mon Sep 17 00:00:00 2001
From: Hongjun Ni <hongjun.ni@intel.com>
Date: Sat, 27 May 2017 20:23:09 +0800
Subject: Rework vxlan-gpe to support FIB 2.0 and bypass mode

Change-Id: I0324f945bdb4dd3b19151be6f3ce24a47a000104
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
---
 src/vnet/vxlan-gpe/vxlan_gpe_api.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/vnet/vxlan-gpe/vxlan_gpe_api.c')

diff --git a/src/vnet/vxlan-gpe/vxlan_gpe_api.c b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
index 0215054dff7..3675fc55cd8 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe_api.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
@@ -22,6 +22,7 @@
 
 #include <vnet/interface.h>
 #include <vnet/api_errno.h>
+#include <vnet/feature/feature.h>
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 #include <vnet/fib/fib_table.h>
 
@@ -44,9 +45,26 @@
 #include <vlibapi/api_helper_macros.h>
 
 #define foreach_vpe_api_msg                             \
+_(SW_INTERFACE_SET_VXLAN_GPE_BYPASS, sw_interface_set_vxlan_gpe_bypass)         \
 _(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                   \
 _(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
 
+static void
+  vl_api_sw_interface_set_vxlan_gpe_bypass_t_handler
+  (vl_api_sw_interface_set_vxlan_gpe_bypass_t * mp)
+{
+  vl_api_sw_interface_set_vxlan_gpe_bypass_reply_t *rmp;
+  int rv = 0;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  vnet_int_vxlan_gpe_bypass_mode (sw_if_index, mp->is_ipv6, mp->enable);
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_SW_INTERFACE_SET_VXLAN_GPE_BYPASS_REPLY);
+}
+
 static void
   vl_api_vxlan_gpe_add_del_tunnel_t_handler
   (vl_api_vxlan_gpe_add_del_tunnel_t * mp)
@@ -109,6 +127,7 @@ static void
       clib_memcpy (&(a->local.ip4), mp->local, 4);
       clib_memcpy (&(a->remote.ip4), mp->remote, 4);
     }
+  a->mcast_sw_if_index = ntohl (mp->mcast_sw_if_index);
   a->encap_fib_index = encap_fib_index;
   a->decap_fib_index = decap_fib_index;
   a->protocol = protocol;
@@ -149,6 +168,7 @@ static void send_vxlan_gpe_tunnel_details
       rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id);
       rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
     }
+  rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index);
   rmp->vni = htonl (t->vni);
   rmp->protocol = t->protocol;
   rmp->sw_if_index = htonl (t->sw_if_index);
-- 
cgit 1.2.3-korg