Fix vni/dp_table endianness for gpe iface addition (VPP-882)

[vpp.git] / src / vnet / lisp-gpe / lisp_gpe_api.c

diff --git a/src/vnet/lisp-gpe/lisp_gpe_api.c b/src/vnet/lisp-gpe/lisp_gpe_api.c
index f026e8b..f166369 100644 (file)
--- a/src/vnet/lisp-gpe/lisp_gpe_api.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_api.c
@@ -386,28 +386,30 @@ vl_api_gpe_add_del_iface_t_handler (vl_api_gpe_add_del_iface_t * mp)
 {
   vl_api_gpe_add_del_iface_reply_t *rmp;
   int rv = 0;
+  u32 vni, dp_table;
+
+  vni = clib_net_to_host_u32 (mp->vni);
+  dp_table = clib_net_to_host_u32 (mp->dp_table);
 
   if (mp->is_l2)
     {
       if (mp->is_add)
        {
-         if (~0 ==
-             lisp_gpe_tenant_l2_iface_add_or_lock (mp->vni, mp->dp_table))
+         if (~0 == lisp_gpe_tenant_l2_iface_add_or_lock (vni, dp_table))
            rv = 1;
        }
       else
-       lisp_gpe_tenant_l2_iface_unlock (mp->vni);
+       lisp_gpe_tenant_l2_iface_unlock (vni);
     }
   else
     {
       if (mp->is_add)
        {
-         if (~0 ==
-             lisp_gpe_tenant_l3_iface_add_or_lock (mp->vni, mp->dp_table))
+         if (~0 == lisp_gpe_tenant_l3_iface_add_or_lock (vni, dp_table))
            rv = 1;
        }
       else
-       lisp_gpe_tenant_l3_iface_unlock (mp->vni);
+       lisp_gpe_tenant_l3_iface_unlock (vni);
     }
 
   REPLY_MACRO (VL_API_GPE_ADD_DEL_IFACE_REPLY);
@@ -476,12 +478,14 @@ gpe_native_fwd_rpaths_copy (vl_api_gpe_native_fwd_rpath_t * dst,
                            fib_route_path_t * src, u8 is_ip4)
 {
   fib_route_path_t *e;
+  fib_table_t *table;
   u32 i = 0;
 
   vec_foreach (e, src)
   {
     memset (&dst[i], 0, sizeof (*dst));
-    dst[i].fib_index = e->frp_fib_index;
+    table = fib_table_get (e->frp_fib_index, e->frp_proto);
+    dst[i].fib_index = table->ft_table_id;
     dst[i].nh_sw_if_index = e->frp_sw_if_index;
     dst[i].is_ip4 = is_ip4;
     if (is_ip4)