From 38682396416f315fb5c5b0f8c25beb7a6a909d4f Mon Sep 17 00:00:00 2001
From: Alberto Compagno <acompagn+fdio@cisco.com>
Date: Wed, 11 Dec 2019 09:57:58 +0100
Subject: [HICN-445] Update to vpp 20.01

Change-Id: I19a442080b6ca8b0477a8f92f161282288c395ee
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
---
 libtransport/src/hicn/transport/core/hicn_vapi.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'libtransport/src/hicn')

diff --git a/libtransport/src/hicn/transport/core/hicn_vapi.c b/libtransport/src/hicn/transport/core/hicn_vapi.c
index 9cb96231a..af7fa5a03 100644
--- a/libtransport/src/hicn/transport/core/hicn_vapi.c
+++ b/libtransport/src/hicn/transport/core/hicn_vapi.c
@@ -33,12 +33,10 @@
 #include <vnet/ip/format.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/ip_types_api.h>
 #include <vnet/fib/fib_types.h>
 
 #include <vpp_plugins/hicn/error.h>
 #include <vapi/hicn.api.vapi.h>
-//#include <vpp_plugins/hicn/hicn_api.h>
 
 /////////////////////////////////////////////////////
 const char *HICN_ERROR_STRING[] = {
@@ -52,16 +50,6 @@ const char *HICN_ERROR_STRING[] = {
 u8 *
 format_vl_api_address_union (u8 * s, va_list * args)
 {
-  // const vl_api_address_union_t *addr =
-  //   va_arg (*args, vl_api_address_union_t *);
-  // vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t);
-
-  // if (ADDRESS_IP6 == af)
-  //   s = format (s, "%U", format_ip6_address, addr->ip6);
-  // else
-  //   s = format (s, "%U", format_ip4_address, addr->ip4);
-
-  // return s;
   return NULL;
 }
 
@@ -98,7 +86,7 @@ int hicn_vapi_register_prod_app(
   vapi_lock();
   vapi_msg_hicn_api_register_prod_app * msg = vapi_alloc_hicn_api_register_prod_app(ctx);
 
-  if(ip46_address_is_ip4(&input_params->prefix->address)) {
+  if(ip46_address_is_ip4((ip46_address_t *)&input_params->prefix->address)) {
     memcpy(&msg->payload.prefix.address.un.ip4, &input_params->prefix->address, sizeof(ip4_address_t));
     msg->payload.prefix.address.af = ADDRESS_IP4;
   } else {
-- 
cgit 1.2.3-korg