Add VAT handlers for LISP-GPE API

Change-Id: Id1139533c41cabef48394b5d79750608e0b74179
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

2 files changed, 24 insertions, 11 deletions

diff --git a/src/vnet/lisp-gpe/lisp_gpe.c b/src/vnet/lisp-gpe/lisp_gpe.c
index ea6c143d917..d274818d46f 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.c
+++ b/src/vnet/lisp-gpe/lisp_gpe.c
@@ -404,8 +404,9 @@ gpe_show_native_fwd_rpath_command_fn (vlib_main_t * vm,
       vec_foreach (rpath, lgm->native_fwd_rpath[IP4])
       {
 	vlib_cli_output (vm, "nh: %U fib_index %u sw_if_index %u",
-			 format_ip46_address, &rpath->frp_addr, 1,
-			 rpath->frp_fib_index, rpath->frp_sw_if_index);
+			 format_ip46_address, &rpath->frp_addr,
+			 IP46_TYPE_IP4, rpath->frp_fib_index,
+			 rpath->frp_sw_if_index);
       }
     }
   if (vec_len (lgm->native_fwd_rpath[IP6]))
@@ -413,7 +414,7 @@ gpe_show_native_fwd_rpath_command_fn (vlib_main_t * vm,
       vec_foreach (rpath, lgm->native_fwd_rpath[IP6])
       {
 	vlib_cli_output (vm, "nh: %U fib_index %u sw_if_index %u",
-			 format_ip46_address, &rpath->frp_addr, 1,
+			 format_ip46_address, &rpath->frp_addr, IP46_TYPE_IP6,
 			 rpath->frp_fib_index, rpath->frp_sw_if_index);
       }
     }
diff --git a/src/vnet/lisp-gpe/lisp_gpe_api.c b/src/vnet/lisp-gpe/lisp_gpe_api.c
index cb18b4bb980..f026e8b08e8 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_api.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_api.c
@@ -441,26 +441,33 @@ static void
   vl_api_gpe_add_del_native_fwd_rpath_t_handler
   (vl_api_gpe_add_del_native_fwd_rpath_t * mp)
 {
-  vl_api_gpe_add_del_fwd_entry_reply_t *rmp;
+  vl_api_gpe_add_del_native_fwd_rpath_reply_t *rmp;
   vnet_gpe_native_fwd_rpath_args_t _a, *a = &_a;
   int rv = 0;
 
   memset (a, 0, sizeof (a[0]));
 
   if (mp->is_ip4)
-    clib_memcpy (&a->rpath.frp_addr, mp->nh_addr, sizeof (ip4_address_t));
+    clib_memcpy (&a->rpath.frp_addr.ip4, mp->nh_addr, sizeof (ip4_address_t));
   else
-    clib_memcpy (&a->rpath.frp_addr, mp->nh_addr, sizeof (ip6_address_t));
+    clib_memcpy (&a->rpath.frp_addr.ip6, mp->nh_addr, sizeof (ip6_address_t));
 
   a->is_add = mp->is_add;
   a->rpath.frp_proto = mp->is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6;
   a->rpath.frp_fib_index = fib_table_find (a->rpath.frp_proto,
 					   clib_net_to_host_u32
 					   (mp->table_id));
+  if (~0 == a->rpath.frp_fib_index)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto done;
+    }
+
   a->rpath.frp_sw_if_index = clib_net_to_host_u32 (mp->nh_sw_if_index);
   a->rpath.frp_weight = 1;
 
   rv = vnet_gpe_add_del_native_fwd_rpath (a);
+done:
   REPLY_MACRO (VL_API_GPE_ADD_DEL_NATIVE_FWD_RPATH_REPLY);
 }
 
@@ -477,8 +484,11 @@ gpe_native_fwd_rpaths_copy (vl_api_gpe_native_fwd_rpath_t * dst,
     dst[i].fib_index = e->frp_fib_index;
     dst[i].nh_sw_if_index = e->frp_sw_if_index;
     dst[i].is_ip4 = is_ip4;
-    clib_memcpy (&dst[i].nh_addr, &e->frp_addr,
-		 is_ip4 ? sizeof (ip4_address_t) : sizeof (ip6_address_t));
+    if (is_ip4)
+      clib_memcpy (&dst[i].nh_addr, &e->frp_addr.ip4, sizeof (ip4_address_t));
+    else
+      clib_memcpy (&dst[i].nh_addr, &e->frp_addr.ip6, sizeof (ip6_address_t));
+    i++;
   }
 }
 
@@ -513,15 +523,17 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t
   u32 size = 0;
   int rv = 0;
 
-  size = vec_len (lgm->native_fwd_rpath[mp->is_ip4])
+  u8 rpath_index = mp->is_ip4 ? 0 : 1;
+
+  size = vec_len (lgm->native_fwd_rpath[rpath_index])
     * sizeof (vl_api_gpe_native_fwd_rpath_t);
 
   /* *INDENT-OFF* */
   REPLY_MACRO4 (VL_API_GPE_NATIVE_FWD_RPATHS_GET_REPLY, size,
   {
-    rmp->count = vec_len (lgm->native_fwd_rpath[mp->is_ip4]);
+    rmp->count = vec_len (lgm->native_fwd_rpath[rpath_index]);
     gpe_native_fwd_rpaths_copy (rmp->entries,
-				lgm->native_fwd_rpath[mp->is_ip4],
+				lgm->native_fwd_rpath[rpath_index],
 				mp->is_ip4);
     gpe_native_fwd_rpaths_get_reply_t_host_to_net (rmp);
   });