aboutsummaryrefslogtreecommitdiffstats
path: root/libtransport/src/hicn
diff options
context:
space:
mode:
authorAlberto Compagno <acompagn+fdio@cisco.com>2019-12-11 09:57:58 +0100
committerAberto Compagno <acompagn+fdio@cisco.com>2020-01-30 08:21:50 +0000
commit38682396416f315fb5c5b0f8c25beb7a6a909d4f (patch)
tree9b56f4835a8936252f87bc19a27432b4bb8587c0 /libtransport/src/hicn
parentfa11d711aaab5e4cba7e89dcc896866f3e73db3f (diff)
[HICN-445] Update to vpp 20.01
Change-Id: I19a442080b6ca8b0477a8f92f161282288c395ee Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'libtransport/src/hicn')
-rw-r--r--libtransport/src/hicn/transport/core/hicn_vapi.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/libtransport/src/hicn/transport/core/hicn_vapi.c b/libtransport/src/hicn/transport/core/hicn_vapi.c
index 9cb9623..af7fa5a 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 {