feat: boostrap hicn 22.02

The current patch provides several new features, improvements,
bug fixes and also complete rewrite of entire components.

- lib
The hicn packet parser has been improved with a new packet
format fully based on UDP. The TCP header is still temporarily
supported but the UDP header will replace completely the new hicn
packet format. Improvements have been made to make sure every
packet parsing operation is made via this library. The current
new header can be used as header between the payload and the
UDP header or as trailer in the UDP surplus area to be tested
when UDP options will start to be used.

- hicn-light
The portable packet forwarder has been completely rewritten from
scratch with the twofold objective to improve performance and
code size but  also to drop dependencies such as libparc which is
now removed by the current implementation.

- hicn control
the control library is the agent that is used to program the
packet forwarders via their binary API. This component has
benefited from significant improvements in terms of interaction
model which is now event driven and more robust to failures.

- VPP plugin has been updated to support VPP 22.02

- transport
Major improvement have been made to the RTC protocol, to the
support of IO modules and to the security sub system. Signed
manifests are the default data authenticity and integrity framework.
Confidentiality can be enabled by sharing the encryption key to the
prod/cons layer. The library has been tested with group key based
applications such as broadcast/multicast and real-time on-line
meetings with trusted server keys or MLS.

- testing
Unit testing has been introduced using GoogleTest. One third of
the code base is covered by unit testing with priority on
critical features. Functional testing has also been introduce
using Docker, linux bridging and Robot Framework to define
test with Less Code techniques to facilitate the extension
of the coverage.

Co-authored-by: Mauro Sardara <msardara@cisco.com>
Co-authored-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Co-authored-by: Michele Papalini <micpapal@cisco.com>
Co-authored-by: Angelo Mantellini <manangel@cisco.com>
Co-authored-by: Jacques Samain <jsamain@cisco.com>
Co-authored-by: Olivier Roques <oroques+fdio@cisco.com>
Co-authored-by: Enrico Loparco <eloparco@cisco.com>
Co-authored-by: Giulio Grassi <gigrassi@cisco.com>

Change-Id: I75d0ef70f86d921e3ef503c99271216ff583c215
Signed-off-by: Luca Muscariello <muscariello@ieee.org>
Signed-off-by: Mauro Sardara <msardara@cisco.com>

1 files changed, 496 insertions, 399 deletions

diff --git a/ctrl/libhicnctrl/src/modules/hicn_plugin_api.c b/ctrl/libhicnctrl/src/modules/hicn_plugin_api.c
index e59a2e41e..6d1baa786 100644
--- a/ctrl/libhicnctrl/src/modules/hicn_plugin_api.c
+++ b/ctrl/libhicnctrl/src/modules/hicn_plugin_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020 Cisco and/or its affiliates.
+ * Copyright (c) 2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -18,8 +18,6 @@
  * \brief Implementation of hICN control library API
  */
 
-#include "api_private.h"
-
 #include <assert.h>  // assert
 #include <fcntl.h>   // fcntl
 #include <math.h>    // log2
@@ -29,40 +27,10 @@
 #include <sys/socket.h>  // socket
 #include <unistd.h>      // close, fcntl
 #include <vapi/vapi_safe.h>
-#include <vapi/hicn.api.vapi.h>
-#include <vapi/ip.api.vapi.h>
-#include <vapi/udp.api.vapi.h>
-#include <vapi/interface.api.vapi.h>
-
-
-#if __GNUC__ >= 9
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
-#endif
-
-#include <vnet/ip/ip46_address.h>
-
-#if __GNUC__ >= 9
-#pragma GCC diagnostic pop
-#endif
-
-#define APP_NAME "hicn_plugin"
-#define MAX_OUTSTANDING_REQUESTS 4
-#define RESPONSE_QUEUE_SIZE 2
-
-DEFINE_VAPI_MSG_IDS_HICN_API_JSON
-DEFINE_VAPI_MSG_IDS_INTERFACE_API_JSON
-DEFINE_VAPI_MSG_IDS_IP_API_JSON
-DEFINE_VAPI_MSG_IDS_UDP_API_JSON
+#include <vppinfra/clib.h>
+#include <vpp_plugins/hicn/error.h>
 
-typedef struct {
-  vapi_ctx_t g_vapi_ctx_instance;
-  bool async;
-} vapi_skc_ctx_t;
-
-vapi_skc_ctx_t vapi_skc = {
-  .g_vapi_ctx_instance = NULL,
-  .async = false,
-};
+#include "api_private.h"
 
 /**
  * Messages to the forwarder might be multiplexed thanks to the seqNum fields in
@@ -81,7 +49,6 @@ struct hc_sock_vpp_s {
 
   vapi_ctx_t g_vapi_ctx_instance;
   char *url;
-  int fd;
 
   size_t roff; /**< Read offset */
   size_t woff; /**< Write offset */
@@ -94,43 +61,42 @@ struct hc_sock_vpp_s {
 
 typedef struct hc_sock_vpp_s hc_sock_vpp_t;
 
-#define TO_HC_SOCK_VPP(s) (hc_sock_vpp_t*)(s)
+#define TO_HC_SOCK_VPP(s) (hc_sock_vpp_t *)(s)
 
 /******************************************************************************
  * Message helper types and aliases
  ******************************************************************************/
 
-#define foreach_hc_command             \
-  _(hicn_api_node_params_set)          \
-  _(hicn_api_node_params_set_reply)    \
-  _(hicn_api_node_params_get_reply)    \
-  _(hicn_api_node_stats_get_reply)     \
-  _(hicn_api_face_get)                 \
-  _(hicn_api_faces_details)            \
-  _(hicn_api_face_stats_details)       \
-  _(hicn_api_face_get_reply)           \
-  _(hicn_api_route_get)                \
-  _(hicn_api_route_get_reply)          \
-  _(hicn_api_routes_details)           \
-  _(hicn_api_strategies_get_reply)     \
-  _(hicn_api_strategy_get)             \
+#define foreach_hc_command          \
+  _(hicn_api_node_params_set)       \
+  _(hicn_api_node_params_set_reply) \
+  _(hicn_api_node_params_get_reply) \
+  _(hicn_api_node_stats_get_reply)  \
+  _(hicn_api_face_get)              \
+  _(hicn_api_faces_details)         \
+  _(hicn_api_face_stats_details)    \
+  _(hicn_api_face_get_reply)        \
+  _(hicn_api_route_get)             \
+  _(hicn_api_route_get_reply)       \
+  _(hicn_api_routes_details)        \
+  _(hicn_api_strategies_get_reply)  \
+  _(hicn_api_strategy_get)          \
   _(hicn_api_strategy_get_reply)
 
-
 typedef vapi_type_msg_header2_t hc_msg_header_t;
 
 typedef union {
-#define _(a) vapi_payload_ ## a a;
+#define _(a) vapi_payload_##a a;
   foreach_hc_command
 #undef _
 } hc_msg_payload_t;
 
-typedef struct __attribute__ ((__packed__)) {
+typedef struct __attribute__((__packed__)) {
   hc_msg_header_t hdr;
   hc_msg_payload_t payload;
 } hc_hicnp_t;
 
-typedef void (* NTOH)(void *msg);
+typedef void (*NTOH)(void *msg);
 
 typedef struct __attribute__((__packed__)) {
   hc_data_t *data;
@@ -138,7 +104,7 @@ typedef struct __attribute__((__packed__)) {
 } callback_ctx_t;
 
 typedef struct __attribute__((__packed__)) {
-  hc_hicnp_t * hicnp_msg;
+  hc_hicnp_t *hicnp_msg;
   vapi_cb_t callback;
   callback_ctx_t *callback_ctx;
   NTOH ntoh;
@@ -151,11 +117,9 @@ typedef struct __attribute__((__packed__)) {
 static void _hc_sock_vpp_free(hc_sock_t *socket) {
   hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket);
   if (s->url) free(s->url);
-  close(s->fd);
   free(s);
 
   vapi_disconnect_safe();
-  vapi_skc.g_vapi_ctx_instance = NULL;
 }
 
 static int _hc_sock_vpp_get_next_seq(hc_sock_t *socket) {
@@ -174,8 +138,7 @@ static int _hc_sock_vpp_get_fd(hc_sock_t *s) { return 1; }
 static int _hc_sock_vpp_connect(hc_sock_t *socket) {
   hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket);
   vapi_error_e rv = vapi_connect_safe(&s->g_vapi_ctx_instance, s->async);
-  if (rv != VAPI_OK)
-    goto ERR_CONNECT;
+  if (rv != VAPI_OK) goto ERR_CONNECT;
 
   return 0;
 
@@ -184,7 +147,8 @@ ERR_CONNECT:
   return -1;
 }
 
-static int _hc_sock_vpp_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen, int seq) {
+static int _hc_sock_vpp_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen,
+                             uint32_t seq) {
   return -1;
 }
 
@@ -199,16 +163,16 @@ static int _hc_sock_vpp_recv(hc_sock_t *s) {
 }
 
 static int _hc_sock_vpp_process(hc_sock_t *s, hc_data_t **pdata) {
-  //NOT IMPLEMENTED
+  // NOT IMPLEMENTED
   return -1;
 }
 
-static int _hc_sock_vpp_callback(hc_sock_t * socket, hc_data_t ** pdata) {
+static int _hc_sock_vpp_callback(hc_sock_t *socket, hc_data_t **pdata) {
   // NOT IMPLEMENTED
   return -1;
 }
 
-static int _hc_sock_vpp_reset(hc_sock_t * socket) {
+static int _hc_sock_vpp_reset(hc_sock_t *socket) {
   // NOT IMPLEMENTED
   return -1;
 }
@@ -217,7 +181,6 @@ static int _hc_sock_vpp_reset(hc_sock_t * socket) {
  * Command-specific structures and functions
  ******************************************************************************/
 
-
 /*----------------------------------------------------------------------------*
  * Listeners
  *----------------------------------------------------------------------------*/
@@ -236,7 +199,7 @@ static int _hc_listener_create_async(hc_sock_t *s, hc_listener_t *listener) {
 
 /* LISTENER GET */
 static int _hc_listener_get(hc_sock_t *s, hc_listener_t *listener,
-                    hc_listener_t **listener_found) {
+                            hc_listener_t **listener_found) {
   // NOT IMPLEMENTED
   return -1;
 }
@@ -253,33 +216,32 @@ static int _hc_listener_delete_async(hc_sock_t *s, hc_listener_t *listener) {
   return -1;
 }
 
-static vapi_error_e process_ip_info(struct vapi_ctx_s *ctx,
-                                    void *callback_ctx,
-                                    vapi_error_e rv,
-                                    bool is_last,
+static vapi_error_e process_ip_info(struct vapi_ctx_s *ctx, void *callback_ctx,
+                                    vapi_error_e rv, bool is_last,
                                     vapi_payload_ip_address_details *reply) {
-
-  if (is_last)
-    return 0;
+  if (is_last) return 0;
   hc_data_t *data = (hc_data_t *)callback_ctx;
 
   if (data->size == data->current) {
-    data->buffer = realloc(data->buffer, sizeof(hc_listener_t) * data->size * 2);
+    data->buffer =
+        realloc(data->buffer, sizeof(hc_listener_t) * data->size * 2);
 
-    if (!data->buffer)
-      return VAPI_ENOMEM;
+    if (!data->buffer) return VAPI_ENOMEM;
 
-    data->size *=2;
+    data->size *= 2;
   }
 
-  hc_listener_t * listener = (hc_listener_t *)(data->buffer + data->current * sizeof(hc_listener_t));
+  hc_listener_t *listener =
+      (hc_listener_t *)(data->buffer + data->current * sizeof(hc_listener_t));
+  memset(listener, 0, sizeof(hc_listener_t));
 
-  if(reply->prefix.address.af == ADDRESS_IP4) {
-    memcpy(listener->local_addr.v4.as_u8, reply->prefix.address.un.ip4, IPV4_ADDR_LEN);
+  if (reply->prefix.address.af == ADDRESS_IP4) {
+    memcpy(listener->local_addr.v4.as_u8, reply->prefix.address.un.ip4,
+           IPV4_ADDR_LEN);
     listener->family = AF_INET;
-  }
-  else {
-    memcpy(listener->local_addr.v6.as_u8, reply->prefix.address.un.ip6, IPV6_ADDR_LEN);
+  } else {
+    memcpy(listener->local_addr.v6.as_u8, reply->prefix.address.un.ip6,
+           IPV6_ADDR_LEN);
     listener->family = AF_INET6;
   }
 
@@ -293,31 +255,26 @@ typedef struct {
   char interface_name[INTERFACE_LEN];
 } hc_vapi_interface_t;
 
-static vapi_error_e listener_list_complete_cb (
-                struct vapi_ctx_s *ctx,
-                void *callback_ctx,
-                vapi_error_e rv,
-                bool is_last,
-				        vapi_payload_sw_interface_details *reply) {
+static vapi_error_e listener_list_complete_cb(
+    struct vapi_ctx_s *ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_sw_interface_details *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
-
-  if (is_last)
-    return 0;
+  if (is_last) return 0;
 
   hc_data_t *data = (hc_data_t *)callback_ctx;
 
   if (data->size == data->current) {
-    data->buffer = realloc(data->buffer, sizeof(hc_vapi_interface_t) * data->size * 2);
+    data->buffer =
+        realloc(data->buffer, sizeof(hc_vapi_interface_t) * data->size * 2);
 
-    if (!data->buffer)
-      return VAPI_ENOMEM;
+    if (!data->buffer) return VAPI_ENOMEM;
 
-    data->size *=2;
+    data->size *= 2;
   }
 
-  hc_vapi_interface_t *swif = &((hc_vapi_interface_t*)data->buffer)[data->current];
+  hc_vapi_interface_t *swif =
+      &((hc_vapi_interface_t *)data->buffer)[data->current];
 
   swif[0].swif = reply->sw_if_index;
   memcpy(swif[0].interface_name, reply->interface_name, INTERFACE_LEN);
@@ -327,7 +284,6 @@ static vapi_error_e listener_list_complete_cb (
   return rv;
 }
 
-
 /* LISTENER LIST */
 static int _hc_listener_list(hc_sock_t *socket, hc_data_t **pdata) {
   hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket);
@@ -344,14 +300,14 @@ static int _hc_listener_list(hc_sock_t *socket, hc_data_t **pdata) {
   hicnp_msg->payload.sw_if_index = ~0;
   hicnp_msg->payload.name_filter_valid = 0;
 
-  hc_data_t *data = hc_data_create(0, sizeof(hc_vapi_interface_t),NULL);
+  hc_data_t *data = hc_data_create(0, sizeof(hc_vapi_interface_t), NULL);
 
   if (!data) {
     retval = -1;
     goto END;
   }
 
-  hc_data_t *data2 = hc_data_create(0, 1,NULL);
+  hc_data_t *data2 = hc_data_create(0, 1, NULL);
 
   if (!data2) {
     retval = -1;
@@ -362,12 +318,13 @@ static int _hc_listener_list(hc_sock_t *socket, hc_data_t **pdata) {
   data->size = 1;
 
   if (!data->buffer) {
-    free (data);
+    free(data);
     retval = -1;
     goto FREE_DATA;
   }
 
-  int ret = vapi_sw_interface_dump(s->g_vapi_ctx_instance, hicnp_msg, listener_list_complete_cb, data);
+  int ret = vapi_sw_interface_dump(s->g_vapi_ctx_instance, hicnp_msg,
+                                   listener_list_complete_cb, data);
 
   if (ret != VAPI_OK) {
     free(data->buffer);
@@ -381,28 +338,34 @@ static int _hc_listener_list(hc_sock_t *socket, hc_data_t **pdata) {
   data2->out_element_size = 1;
 
   if (!data2->buffer) {
-    free (data2->buffer);
-    retval =1 -1;
+    free(data2->buffer);
+    retval = -1;
     goto CLEAN;
   }
 
   /* Query the forwarder for each interface */
-  for(int i = 0; i < data->current; i++) {
+  for (int i = 0; i < data->current; i++) {
     int index = data2->current;
-    vapi_msg_ip_address_dump* msg = vapi_alloc_ip_address_dump(s->g_vapi_ctx_instance);
+    vapi_msg_ip_address_dump *msg =
+        vapi_alloc_ip_address_dump(s->g_vapi_ctx_instance);
     msg->payload.sw_if_index = ((hc_vapi_interface_t *)data->buffer)[i].swif;
     msg->payload.is_ipv6 = 0;
-    retval = vapi_ip_address_dump(s->g_vapi_ctx_instance, msg, process_ip_info, data2);
-    vapi_msg_ip_address_dump* msg2 = vapi_alloc_ip_address_dump(s->g_vapi_ctx_instance);
+    retval = vapi_ip_address_dump(s->g_vapi_ctx_instance, msg, process_ip_info,
+                                  data2);
+    vapi_msg_ip_address_dump *msg2 =
+        vapi_alloc_ip_address_dump(s->g_vapi_ctx_instance);
 
     if (retval) goto CLEAN;
 
     msg2->payload.sw_if_index = ((hc_vapi_interface_t *)data->buffer)[i].swif;
     msg2->payload.is_ipv6 = 1;
-    retval = vapi_ip_address_dump(s->g_vapi_ctx_instance, msg2, process_ip_info, data2);
+    retval = vapi_ip_address_dump(s->g_vapi_ctx_instance, msg2, process_ip_info,
+                                  data2);
     for (size_t j = index; j < data2->current; j++) {
-      memcpy(((hc_listener_t *)(data2->buffer))[j].interface_name, ((hc_vapi_interface_t*)(data->buffer))[i].interface_name, INTERFACE_LEN);
-      ((hc_listener_t *)(data2->buffer))[j].type = CONNECTION_TYPE_HICN;
+      memcpy(((hc_listener_t *)(data2->buffer))[j].interface_name,
+             ((hc_vapi_interface_t *)(data->buffer))[i].interface_name,
+             INTERFACE_LEN);
+      ((hc_listener_t *)(data2->buffer))[j].type = FACE_TYPE_HICN;
     }
 
     if (retval) goto CLEAN;
@@ -417,7 +380,7 @@ FREE_DATA:
   data2->size = data2->current;
   data2->out_element_size = sizeof(hc_listener_t);
   *pdata = data2;
- END:
+END:
   vapi_unlock();
   return retval;
 }
@@ -438,7 +401,8 @@ static int _hc_connection_create(hc_sock_t *s, hc_connection_t *connection) {
   return -1;
 }
 
-static int _hc_connection_create_async(hc_sock_t *s, hc_connection_t *connection) {
+static int _hc_connection_create_async(hc_sock_t *s,
+                                       hc_connection_t *connection) {
   // NOT IMPLEMENTED
   return -1;
 }
@@ -446,17 +410,20 @@ static int _hc_connection_create_async(hc_sock_t *s, hc_connection_t *connection
 /* CONNECTION GET */
 
 static int _hc_connection_get(hc_sock_t *s, hc_connection_t *connection,
-                      hc_connection_t **connection_found) {
+                              hc_connection_t **connection_found) {
   // NOT IMPLEMENTED
   return -1;
 }
 
-static int _hc_connection_update_by_id(hc_sock_t *s, int hc_connection_id, hc_connection_t *connection) {
+static int _hc_connection_update_by_id(hc_sock_t *s, int hc_connection_id,
+                                       hc_connection_t *connection) {
   // Not implemented
   return -1;
 }
 
-static int  _hc_connection_update(hc_sock_t *s, hc_connection_t *connection_current, hc_connection_t *connection_updated) {
+static int _hc_connection_update(hc_sock_t *s,
+                                 hc_connection_t *connection_current,
+                                 hc_connection_t *connection_updated) {
   // Not implemented
   return -1;
 }
@@ -468,7 +435,8 @@ static int _hc_connection_delete(hc_sock_t *s, hc_connection_t *connection) {
   return -1;
 }
 
-static int _hc_connection_delete_async(hc_sock_t *s, hc_connection_t *connection) {
+static int _hc_connection_delete_async(hc_sock_t *s,
+                                       hc_connection_t *connection) {
   // NOT IMPLEMENTED
   return -1;
 }
@@ -487,39 +455,47 @@ static int _hc_connection_list_async(hc_sock_t *s, hc_data_t **pdata) {
 
 /* CONNECTION SET ADMIN STATE */
 
-static int _hc_connection_set_admin_state(hc_sock_t *s, const char *conn_id_or_name,
-                                  face_state_t state) {
+static int _hc_connection_set_admin_state(hc_sock_t *s,
+                                          const char *conn_id_or_name,
+                                          face_state_t state) {
   // NOT IMPLEMENTED
   return -1;
 }
 
 static int _hc_connection_set_admin_state_async(hc_sock_t *s,
-                                        const char *conn_id_or_name,
-                                        face_state_t state) {
+                                                const char *conn_id_or_name,
+                                                face_state_t state) {
   // NOT IMPLEMENTED
   return -1;
 }
 
 #ifdef WITH_POLICY
 
-static int _hc_connection_set_priority(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) {
+static int _hc_connection_set_priority(hc_sock_t *s,
+                                       const char *conn_id_or_name,
+                                       uint32_t priority) {
   // NOT IMPLEMENTED
   return -1;
 }
 
-static int _hc_connection_set_priority_async(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) {
+static int _hc_connection_set_priority_async(hc_sock_t *s,
+                                             const char *conn_id_or_name,
+                                             uint32_t priority) {
   // NOT IMPLEMENTED
   return -1;
 }
 
-#endif // WITH_POLICY
+#endif  // WITH_POLICY
 
-static int _hc_connection_set_tags(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) {
+static int _hc_connection_set_tags(hc_sock_t *s, const char *conn_id_or_name,
+                                   policy_tags_t tags) {
   // NOT IMPLEMENTED
   return -1;
 }
 
-static int _hc_connection_set_tags_async(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) {
+static int _hc_connection_set_tags_async(hc_sock_t *s,
+                                         const char *conn_id_or_name,
+                                         policy_tags_t tags) {
   // NOT IMPLEMENTED
   return -1;
 }
@@ -528,66 +504,65 @@ static int _hc_connection_set_tags_async(hc_sock_t * s, const char * conn_id_or_
  * Routes
  *----------------------------------------------------------------------------*/
 
-static vapi_error_e create_udp_tunnel_cb( vapi_ctx_t ctx,
-				void *callback_ctx,
-				vapi_error_e rv,
-				bool is_last,
-				vapi_payload_hicn_api_udp_tunnel_add_del_reply *reply) {
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e create_udp_tunnel_cb(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_hicn_api_udp_tunnel_add_del_reply *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
-  if (reply->retval != VAPI_OK)
-    return reply->retval;
+  if (reply->retval != VAPI_OK) return reply->retval;
 
-  u32 * uei = (u32*) callback_ctx;
+  u32 *uei = (u32 *)callback_ctx;
   *uei = reply->uei;
 
   return reply->retval;
 }
 
 /* ROUTE CREATE */
-static vapi_error_e parse_route_create( vapi_ctx_t ctx,
-				void *callback_ctx,
-				vapi_error_e rv,
-				bool is_last,
-				vapi_payload_ip_route_add_del_reply *reply) {
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e parse_route_create(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_ip_route_add_del_reply *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
-  if (reply->retval != VAPI_OK)
-    return reply->retval;
+  if (reply->retval != VAPI_OK) return reply->retval;
 
   return reply->retval;
 }
 
-static vapi_error_e hicn_enable_cb( vapi_ctx_t ctx,
-                              void *callback_ctx,
-                              vapi_error_e rv,
-                              bool is_last,
-                              vapi_payload_hicn_api_enable_disable_reply *reply) {
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e hicn_enable_cb(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_hicn_api_enable_disable_reply *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
+  face_id_t *faceid = (face_id_t *)callback_ctx;
+
+  if (reply->nfaces) {
+    *faceid = reply->faceids[0];
+  }
 
   return reply->retval;
 }
 
-static int _hc_route_create_internal(hc_sock_t *socket, hc_route_t *route, bool async) {
+static int _hc_route_create_internal(hc_sock_t *socket, hc_route_t *route,
+                                     bool async) {
   if (!IS_VALID_FAMILY(route->family)) return -1;
 
   hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket);
-  int ret;
+  int ret = -1;
   vapi_lock();
 
-  vapi_msg_ip_route_add_del *hicnp_msg = vapi_alloc_ip_route_add_del(s->g_vapi_ctx_instance, 1);
+  vapi_msg_ip_route_add_del *hicnp_msg =
+      vapi_alloc_ip_route_add_del(s->g_vapi_ctx_instance, 1);
 
   hicnp_msg->payload.is_add = 1;
   if (route->family == AF_INET) {
-    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip4[0], &route->remote_addr.v4, 4);
+    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip4[0],
+           &route->remote_addr.v4, 4);
     hicnp_msg->payload.route.prefix.address.af = ADDRESS_IP4;
-  }
-  else {
-    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip6[0], &route->remote_addr.v6, 16);
+    hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP4;
+  } else {
+    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip6[0],
+           &route->remote_addr.v6, 16);
     hicnp_msg->payload.route.prefix.address.af = ADDRESS_IP6;
+    hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP6;
   }
 
   hicnp_msg->payload.route.prefix.len = route->len;
@@ -596,87 +571,101 @@ static int _hc_route_create_internal(hc_sock_t *socket, hc_route_t *route, bool
   hicnp_msg->payload.route.paths[0].table_id = 0;
 
   hc_face_t *face = &(route->face);
-  switch (face->face.type) {
-    case FACE_TYPE_HICN:
-      {
-        if (ip46_address_is_ip4((ip46_address_t *)(&(face->face.remote_addr)))) {
-          memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip4), &face->face.remote_addr.v4, sizeof(ip4_address_t));
-          hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP4;
-        }
-        else{
-          memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip6), &face->face.remote_addr.v6, sizeof(ip6_address_t));
-          hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP6;
-        }
-
-        hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_FLAG_NONE;
-        hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
-
-        break;
-      }
-    case FACE_TYPE_UDP:
-      {
-        vapi_msg_hicn_api_udp_tunnel_add_del *msg = NULL;
-        u32 uei = ~0;
-
-        if (ip46_address_is_ip4((ip46_address_t *)(&(face->face.remote_addr))) &&
-            ip46_address_is_ip4((ip46_address_t *)(&(face->face.local_addr)))) {
 
-          msg = vapi_alloc_hicn_api_udp_tunnel_add_del(s->g_vapi_ctx_instance);
-          memcpy(msg->payload.src_addr.un.ip4, &face->face.local_addr.v4, sizeof(ip4_address_t));
-          msg->payload.src_addr.af = ADDRESS_IP4;
+  face->face.netdevice.index = ~0;
+  face->id = INVALID_FACE_ID;
 
-          memcpy(msg->payload.dst_addr.un.ip4, &face->face.remote_addr.v4, sizeof(ip4_address_t));
-          msg->payload.dst_addr.af = ADDRESS_IP4;
+  switch (face->face.type) {
+    case FACE_TYPE_HICN: {
+      if (ip_address_is_v4((ip_address_t *)(&(face->face.remote_addr)))) {
+        memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip4),
+               &face->face.remote_addr.v4, sizeof(ip4_address_t));
+        hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP4;
+      } else {
+        memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip6),
+               &face->face.remote_addr.v6, sizeof(ip6_address_t));
+        hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP6;
+      }
 
-        } else if (!ip46_address_is_ip4((ip46_address_t *)(&(route->face.face.remote_addr))) &&
-                  !ip46_address_is_ip4((ip46_address_t *)(&(route->face.face.local_addr)))) {
+      hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_TYPE_NORMAL;
+      hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
 
-          msg = vapi_alloc_hicn_api_udp_tunnel_add_del(s->g_vapi_ctx_instance);
-          memcpy(msg->payload.src_addr.un.ip6, &face->face.local_addr.v6, sizeof(ip6_address_t));
-          msg->payload.src_addr.af = ADDRESS_IP4;
+      break;
+    }
+    case FACE_TYPE_UDP: {
+      vapi_msg_hicn_api_udp_tunnel_add_del *msg = NULL;
+      u32 uei = ~0;
+
+      if (ip_address_is_v4((ip_address_t *)(&(face->face.remote_addr))) &&
+          ip_address_is_v4((ip_address_t *)(&(face->face.local_addr)))) {
+        msg = vapi_alloc_hicn_api_udp_tunnel_add_del(s->g_vapi_ctx_instance);
+        memcpy(msg->payload.src_addr.un.ip4, &face->face.local_addr.v4,
+               sizeof(ip4_address_t));
+        msg->payload.src_addr.af = ADDRESS_IP4;
+
+        memcpy(msg->payload.dst_addr.un.ip4, &face->face.remote_addr.v4,
+               sizeof(ip4_address_t));
+        msg->payload.dst_addr.af = ADDRESS_IP4;
+
+      } else if (!ip_address_is_v4(
+                     (ip_address_t *)(&(route->face.face.remote_addr))) &&
+                 !ip_address_is_v4(
+                     (ip_address_t *)(&(route->face.face.local_addr)))) {
+        msg = vapi_alloc_hicn_api_udp_tunnel_add_del(s->g_vapi_ctx_instance);
+        memcpy(msg->payload.src_addr.un.ip6, &face->face.local_addr.v6,
+               sizeof(ip6_address_t));
+        msg->payload.src_addr.af = ADDRESS_IP6;
+
+        memcpy(msg->payload.dst_addr.un.ip6, &face->face.remote_addr.v6,
+               sizeof(ip6_address_t));
+        msg->payload.dst_addr.af = ADDRESS_IP6;
+      } else {
+        // NOT IMPLEMENTED
+        ret = -1;
+        goto done;
+      }
 
-          memcpy(msg->payload.dst_addr.un.ip6, &face->face.remote_addr.v6, sizeof(ip6_address_t));
-          msg->payload.dst_addr.af = ADDRESS_IP6;
+      msg->payload.src_port = face->face.local_port;
+      msg->payload.dst_port = face->face.remote_port;
+      msg->payload.is_add = 1;
 
-        } else {
-          //NOT IMPLEMENTED
-          ret = -1;
-          goto done;
-        }
+      int ret = vapi_hicn_api_udp_tunnel_add_del(s->g_vapi_ctx_instance, msg,
+                                                 create_udp_tunnel_cb, &uei);
 
-        msg->payload.src_port = face->face.local_port;
-        msg->payload.dst_port = face->face.remote_port;
-        msg->payload.is_add = 1;
+      if (ret) {
+        ERROR("Error in vapi_hicn_api_udp_tunnel_add_del");
+        vapi_msg_free(s->g_vapi_ctx_instance, hicnp_msg);
+        goto done;
+      }
 
-        int ret = vapi_hicn_api_udp_tunnel_add_del(s->g_vapi_ctx_instance, msg, create_udp_tunnel_cb, &uei);
+      hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_TYPE_UDP_ENCAP;
+      hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
+      hicnp_msg->payload.route.paths[0].nh.obj_id = uei;
 
-        if(ret) {
-          vapi_msg_free(s->g_vapi_ctx_instance, hicnp_msg);
-          goto done;
-        }
+      face->face.netdevice.index = uei;
 
-        hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_TYPE_UDP_ENCAP;
-        hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
-        hicnp_msg->payload.route.paths[0].nh.obj_id = uei;
-        break;
-      }
+      break;
+    }
     default:
       ret = -1;
       goto done;
   }
 
-  ret = vapi_ip_route_add_del(s->g_vapi_ctx_instance, hicnp_msg, parse_route_create, NULL);
+  ret = vapi_ip_route_add_del(s->g_vapi_ctx_instance, hicnp_msg,
+                              parse_route_create, NULL);
 
-  if (ret)
+  if (ret) {
+    ERROR("Error in vapi_ip_route_add_del");
     goto done;
+  }
 
-  vapi_msg_hicn_api_enable_disable *msg = vapi_alloc_hicn_api_enable_disable(s->g_vapi_ctx_instance);
+  vapi_msg_hicn_api_enable_disable *msg =
+      vapi_alloc_hicn_api_enable_disable(s->g_vapi_ctx_instance);
 
   if (route->family == AF_INET) {
     memcpy(&msg->payload.prefix.address.un.ip4[0], &route->remote_addr.v4, 4);
     msg->payload.prefix.address.af = ADDRESS_IP4;
-  }
-  else {
+  } else {
     memcpy(&msg->payload.prefix.address.un.ip6[0], &route->remote_addr.v6, 16);
     msg->payload.prefix.address.af = ADDRESS_IP6;
   }
@@ -684,7 +673,13 @@ static int _hc_route_create_internal(hc_sock_t *socket, hc_route_t *route, bool
   msg->payload.prefix.len = route->len;
   msg->payload.enable_disable = 1;
 
-  ret = vapi_hicn_api_enable_disable(s->g_vapi_ctx_instance, msg, hicn_enable_cb, NULL);
+  ret = vapi_hicn_api_enable_disable(s->g_vapi_ctx_instance, msg,
+                                     hicn_enable_cb, &face->id);
+
+  if (ret) {
+    ERROR("Error in vapi_hicn_api_enable_disable");
+  }
+
 done:
   vapi_unlock();
   return ret;
@@ -699,32 +694,63 @@ static int _hc_route_create_async(hc_sock_t *s, hc_route_t *route) {
 }
 
 /* ROUTE DELETE */
-static vapi_error_e parse_route_delete( vapi_ctx_t ctx,
-				void *callback_ctx,
-				vapi_error_e rv,
-				bool is_last,
-				vapi_payload_ip_route_add_del_reply *reply) {
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e parse_route_delete(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_ip_route_add_del_reply *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
+
+  return reply->retval;
+}
+
+static vapi_error_e hicn_disable_cb(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_hicn_api_enable_disable_reply *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
   return reply->retval;
 }
 
-static int _hc_route_delete_internal(hc_sock_t *socket, hc_route_t *route, bool async) {
+static int _hc_route_delete_internal(hc_sock_t *socket, hc_route_t *route,
+                                     bool async) {
   if (!IS_VALID_FAMILY(route->family)) return -1;
 
   hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket);
 
   vapi_lock();
-  vapi_msg_ip_route_add_del *hicnp_msg = vapi_alloc_ip_route_add_del(s->g_vapi_ctx_instance, 1);
+
+  vapi_msg_hicn_api_enable_disable *msg =
+      vapi_alloc_hicn_api_enable_disable(s->g_vapi_ctx_instance);
+
+  if (route->family == AF_INET) {
+    memcpy(&msg->payload.prefix.address.un.ip4[0], &route->remote_addr.v4, 4);
+    msg->payload.prefix.address.af = ADDRESS_IP4;
+  } else {
+    memcpy(&msg->payload.prefix.address.un.ip6[0], &route->remote_addr.v6, 16);
+    msg->payload.prefix.address.af = ADDRESS_IP6;
+  }
+
+  msg->payload.prefix.len = route->len;
+  msg->payload.enable_disable = 0;
+
+  vapi_error_e ret = vapi_hicn_api_enable_disable(s->g_vapi_ctx_instance, msg,
+                                                  hicn_disable_cb, NULL);
+
+  if (ret) {
+    ERROR("Error in vapi_hicn_api_enable_disable in route delete");
+    goto done;
+  }
+
+  vapi_msg_ip_route_add_del *hicnp_msg =
+      vapi_alloc_ip_route_add_del(s->g_vapi_ctx_instance, 1);
 
   hicnp_msg->payload.is_add = 0;
   if (route->family == AF_INET) {
-    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip4[0], &route->remote_addr.v4, 4);
+    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip4[0],
+           &route->remote_addr.v4, 4);
     hicnp_msg->payload.route.prefix.address.af = ADDRESS_IP4;
-  }
-  else {
-    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip6[0], &route->remote_addr.v6, 16);
+  } else {
+    memcpy(&hicnp_msg->payload.route.prefix.address.un.ip6[0],
+           &route->remote_addr.v6, 16);
     hicnp_msg->payload.route.prefix.address.af = ADDRESS_IP6;
   }
 
@@ -735,34 +761,41 @@ static int _hc_route_delete_internal(hc_sock_t *socket, hc_route_t *route, bool
 
   hc_face_t *face = &(route->face);
   switch (face->face.type) {
-    case FACE_TYPE_HICN:
-      {
-        if (ip46_address_is_ip4((ip46_address_t *)(&(face->face.remote_addr)))) {
-          memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip4), &face->face.remote_addr.v4, sizeof(ip4_address_t));
-          hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP4;
-        }
-        else{
-          memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip6), &face->face.remote_addr.v6, sizeof(ip6_address_t));
-          hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP6;
-        }
-
-        hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_FLAG_NONE;
-        hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
-
-        break;
-      }
-    case FACE_TYPE_UDP:
-      {
-        hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_TYPE_UDP_ENCAP;
-        hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
-        hicnp_msg->payload.route.paths[0].nh.obj_id = face->face.netdevice.index;
-        break;
+    case FACE_TYPE_HICN: {
+      if (ip_address_is_v4((ip_address_t *)(&(face->face.remote_addr)))) {
+        memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip4),
+               &face->face.remote_addr.v4, sizeof(ip4_address_t));
+        hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP4;
+      } else {
+        memcpy(&(hicnp_msg->payload.route.paths[0].nh.address.ip6),
+               &face->face.remote_addr.v6, sizeof(ip6_address_t));
+        hicnp_msg->payload.route.paths[0].proto = FIB_API_PATH_NH_PROTO_IP6;
       }
+
+      hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_TYPE_NORMAL;
+      hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
+
+      break;
+    }
+    case FACE_TYPE_UDP: {
+      hicnp_msg->payload.route.paths[0].type = FIB_API_PATH_TYPE_UDP_ENCAP;
+      hicnp_msg->payload.route.paths[0].flags = FIB_API_PATH_FLAG_NONE;
+      hicnp_msg->payload.route.paths[0].nh.obj_id = face->face.netdevice.index;
+      break;
+    }
     default:
       return -1;
   }
 
-  vapi_error_e ret = vapi_ip_route_add_del(s->g_vapi_ctx_instance, hicnp_msg, parse_route_delete, NULL);
+  ret = vapi_ip_route_add_del(s->g_vapi_ctx_instance, hicnp_msg,
+                              parse_route_delete, NULL);
+
+  if (ret) {
+    ERROR("Error in vapi_ip_route_add_del in route delete");
+    goto done;
+  }
+
+done:
 
   vapi_unlock();
   return ret;
@@ -776,33 +809,31 @@ static int _hc_route_delete_async(hc_sock_t *s, hc_route_t *route) {
   return _hc_route_delete_internal(s, route, true);
 }
 
-static vapi_error_e parse_udp_encap_list( vapi_ctx_t ctx,
-			      void *callback_ctx,
-			      vapi_error_e rv,
-			      bool is_last,
-			      vapi_payload_udp_encap_details *reply) {
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e parse_udp_encap_list(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_udp_encap_details *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
-  hc_face_t * face = (hc_face_t *)callback_ctx;
+  hc_face_t *face = (hc_face_t *)callback_ctx;
 
-  if (face->face.netdevice.index == reply->udp_encap.id)
-  {
-    switch(reply->udp_encap.src_ip.af) {
-      case ADDRESS_IP4:
-      {
-        memcpy(&face->face.local_addr.v4, &(reply->udp_encap.src_ip.un.ip4), sizeof(ip4_address_t));
-        memcpy(&face->face.remote_addr.v4, &(reply->udp_encap.dst_ip.un.ip4), sizeof(ip4_address_t));
+  if (face->face.netdevice.index == reply->udp_encap.id) {
+    switch (reply->udp_encap.src_ip.af) {
+      case ADDRESS_IP4: {
+        memcpy(&face->face.local_addr.v4, &(reply->udp_encap.src_ip.un.ip4),
+               sizeof(ip4_address_t));
+        memcpy(&face->face.remote_addr.v4, &(reply->udp_encap.dst_ip.un.ip4),
+               sizeof(ip4_address_t));
         break;
       }
-      case ADDRESS_IP6:
-      {
-        memcpy(&face->face.local_addr.v6, &(reply->udp_encap.src_ip.un.ip6), sizeof(ip6_address_t));
-        memcpy(&face->face.remote_addr.v6, &(reply->udp_encap.dst_ip.un.ip6), sizeof(ip6_address_t));
+      case ADDRESS_IP6: {
+        memcpy(&face->face.local_addr.v6, &(reply->udp_encap.src_ip.un.ip6),
+               sizeof(ip6_address_t));
+        memcpy(&face->face.remote_addr.v6, &(reply->udp_encap.dst_ip.un.ip6),
+               sizeof(ip6_address_t));
         break;
       }
       default:
-      break;
+        break;
     }
 
     face->face.local_port = reply->udp_encap.src_port;
@@ -811,35 +842,35 @@ static vapi_error_e parse_udp_encap_list( vapi_ctx_t ctx,
   return rv;
 }
 
-static int _fill_face_with_info(hc_face_t * face, vapi_type_fib_path *path, hc_sock_t *s) {
-  switch(path->type){
-    case FIB_API_PATH_FLAG_NONE:
-    {
+static int _fill_face_with_info(hc_face_t *face, vapi_type_fib_path *path,
+                                hc_sock_t *s) {
+  switch (path->type) {
+    case FIB_API_PATH_FLAG_NONE: {
       face->face.type = FACE_TYPE_HICN;
-      switch(path->proto){
+      switch (path->proto) {
         case FIB_API_PATH_NH_PROTO_IP4:
-          memcpy(&face->face.remote_addr.v4, &(path->nh.address.ip4), sizeof(ip4_address_t));
-        break;
+          memcpy(&face->face.remote_addr.v4, &(path->nh.address.ip4),
+                 sizeof(ip4_address_t));
+          break;
         case FIB_API_PATH_NH_PROTO_IP6:
-          memcpy(&face->face.remote_addr.v6, &(path->nh.address.ip6), sizeof(ip6_address_t));
-        break;
+          memcpy(&face->face.remote_addr.v6, &(path->nh.address.ip6),
+                 sizeof(ip6_address_t));
+          break;
         default:
-        break;
+          break;
       }
       face->face.netdevice.index = path->sw_if_index;
-    }
-    break;
-    case FIB_API_PATH_TYPE_UDP_ENCAP:
-    {
+    } break;
+    case FIB_API_PATH_TYPE_UDP_ENCAP: {
       face->face.type = FACE_TYPE_UDP;
       face->face.netdevice.index = clib_net_to_host_u32(path->nh.obj_id);
       // Let's make the compiler happy
       (void)parse_udp_encap_list;
-      //vapi_msg_udp_encap_dump *msg;
-      //msg = vapi_alloc_udp_encap_dump(s->g_vapi_ctx_instance);
-      //vapi_udp_encap_dump(s->g_vapi_ctx_instance, msg, parse_udp_encap_list, face);
-    }
-    break;
+      // vapi_msg_udp_encap_dump *msg;
+      // msg = vapi_alloc_udp_encap_dump(s->g_vapi_ctx_instance);
+      // vapi_udp_encap_dump(s->g_vapi_ctx_instance, msg, parse_udp_encap_list,
+      // face);
+    } break;
     default:
       return -1;
   }
@@ -852,32 +883,33 @@ typedef struct hicn_route_socket_s {
   hc_sock_t *s;
 } hicn_route_socket_t;
 
-static vapi_error_e parse_route_list( vapi_ctx_t ctx,
-			      void *callback_ctx,
-			      vapi_error_e rv,
-			      bool is_last,
-			      vapi_payload_ip_route_details *reply) {
-
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e parse_route_list(vapi_ctx_t ctx, void *callback_ctx,
+                                     vapi_error_e rv, bool is_last,
+                                     vapi_payload_ip_route_details *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
   hicn_route_socket_t *rs = (hicn_route_socket_t *)callback_ctx;
   hc_data_t *data = rs->data;
 
   u8 found = false;
-  for (int j = 0; j < reply->route.n_paths; j++){
+  for (int j = 0; j < reply->route.n_paths; j++) {
     for (int i = 0; i < data->size && !found; i++) {
-      hc_route_t * route = &((hc_route_t*)(data->buffer))[i];
-
-      if(ip46_address_is_ip4((ip46_address_t *)&(route->remote_addr)) &&
-        memcmp(route->remote_addr.v4.as_u8, reply->route.prefix.address.un.ip4, sizeof(ip4_address_t)) == 0 &&
-        route->len == reply->route.prefix.len && route->face_id == ~0) {
-          _fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s);
-          found = true;
-      } else if (memcmp(route->remote_addr.v6.as_u8, reply->route.prefix.address.un.ip6, sizeof(ip6_address_t)) == 0 &&
-                route->len == reply->route.prefix.len && route->face_id == ~0) {
-          _fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s);
-          found = true;
+      hc_route_t *route = &((hc_route_t *)(data->buffer))[i];
+
+      if (ip_address_is_v4((ip_address_t *)&(route->remote_addr)) &&
+          memcmp(route->remote_addr.v4.as_u8,
+                 reply->route.prefix.address.un.ip4,
+                 sizeof(ip4_address_t)) == 0 &&
+          route->len == reply->route.prefix.len && route->face_id == ~0) {
+        _fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s);
+        found = true;
+      } else if (memcmp(route->remote_addr.v6.as_u8,
+                        reply->route.prefix.address.un.ip6,
+                        sizeof(ip6_address_t)) == 0 &&
+                 route->len == reply->route.prefix.len &&
+                 route->face_id == ~0) {
+        _fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s);
+        found = true;
       }
     }
   }
@@ -885,14 +917,10 @@ static vapi_error_e parse_route_list( vapi_ctx_t ctx,
   return rv;
 }
 
-static vapi_error_e parse_hicn_route_list( vapi_ctx_t ctx,
-			      void *callback_ctx,
-			      vapi_error_e rv,
-			      bool is_last,
-			      vapi_payload_hicn_api_routes_details *reply) {
-
-  if (reply == NULL || rv != VAPI_OK)
-    return rv;
+static vapi_error_e parse_hicn_route_list(
+    vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last,
+    vapi_payload_hicn_api_routes_details *reply) {
+  if (reply == NULL || rv != VAPI_OK) return rv;
 
   hc_data_t *data = (hc_data_t *)callback_ctx;
 
@@ -900,43 +928,41 @@ static vapi_error_e parse_hicn_route_list( vapi_ctx_t ctx,
   if (empty_spots < reply->nfaces) {
     int new_size = data->size + (reply->nfaces - empty_spots);
     data->buffer = realloc(data->buffer, sizeof(hc_route_t) * (new_size));
-    if (!data->buffer)
-      return VAPI_ENOMEM;
+    if (!data->buffer) return VAPI_ENOMEM;
 
-    data->size =new_size;
+    data->size = new_size;
   }
 
   for (int i = 0; i < reply->nfaces; i++) {
-    hc_route_t * route = &((hc_route_t*)(data->buffer))[data->current];
+    hc_route_t *route = &((hc_route_t *)(data->buffer))[data->current];
     route->face_id = ~0;
     route->cost = 1;
     route->len = reply->prefix.len;
-    if (reply->prefix.address.af == ADDRESS_IP6)
-      {
-        memcpy(route->remote_addr.v6.as_u8, reply->prefix.address.un.ip6, 16);
-      }
-      else
-      {
-        memcpy(route->remote_addr.v4.as_u8, reply->prefix.address.un.ip4, 4);
-      }
-    route->family = reply->prefix.address.af == ADDRESS_IP6? AF_INET6 : AF_INET;
+    if (reply->prefix.address.af == ADDRESS_IP6) {
+      memcpy(route->remote_addr.v6.as_u8, reply->prefix.address.un.ip6, 16);
+    } else {
+      memcpy(route->remote_addr.v4.as_u8, reply->prefix.address.un.ip4, 4);
+    }
+    route->family =
+        reply->prefix.address.af == ADDRESS_IP6 ? AF_INET6 : AF_INET;
     data->current++;
   }
 
   return rv;
 }
 
-static int _hc_route_list_internal(hc_sock_t *socket, hc_data_t **pdata, bool async) {
+static int _hc_route_list_internal(hc_sock_t *socket, hc_data_t **pdata,
+                                   bool async) {
   hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket);
   vapi_lock();
 
   vapi_msg_hicn_api_routes_dump *msg;
   msg = vapi_alloc_hicn_api_routes_dump(s->g_vapi_ctx_instance);
 
-  hc_data_t *data = hc_data_create(0, sizeof(hc_route_t),NULL);
+  hc_data_t *data = hc_data_create(0, sizeof(hc_route_t), NULL);
   int ret = VAPI_OK;
 
-  if (!data){
+  if (!data) {
     ret = -1;
     goto err;
   }
@@ -949,10 +975,10 @@ static int _hc_route_list_internal(hc_sock_t *socket, hc_data_t **pdata, bool as
     goto err_free;
   }
 
-  ret = vapi_hicn_api_routes_dump(s->g_vapi_ctx_instance, msg, parse_hicn_route_list, data);
+  ret = vapi_hicn_api_routes_dump(s->g_vapi_ctx_instance, msg,
+                                  parse_hicn_route_list, data);
 
-  if (ret != VAPI_OK)
-    goto err_free;
+  if (ret != VAPI_OK) goto err_free;
 
   vapi_msg_ip_route_dump *hicnp_msg;
   hicnp_msg = vapi_alloc_ip_route_dump(s->g_vapi_ctx_instance);
@@ -960,29 +986,30 @@ static int _hc_route_list_internal(hc_sock_t *socket, hc_data_t **pdata, bool as
   hicnp_msg->payload.table.is_ip6 = 1;
 
   hicn_route_socket_t ctx = {
-    .data = data,
-    .s = socket,
+      .data = data,
+      .s = socket,
   };
 
-  ret = vapi_ip_route_dump(s->g_vapi_ctx_instance, hicnp_msg, parse_route_list, &ctx);
+  ret = vapi_ip_route_dump(s->g_vapi_ctx_instance, hicnp_msg, parse_route_list,
+                           &ctx);
 
   hicnp_msg = vapi_alloc_ip_route_dump(s->g_vapi_ctx_instance);
   hicnp_msg->payload.table.table_id = 0;
   hicnp_msg->payload.table.is_ip6 = 0;
 
-  ret = vapi_ip_route_dump(s->g_vapi_ctx_instance, hicnp_msg, parse_route_list, &ctx);
+  ret = vapi_ip_route_dump(s->g_vapi_ctx_instance, hicnp_msg, parse_route_list,
+                           &ctx);
 
-  if (ret != VAPI_OK)
-    goto err_free;
+  if (ret != VAPI_OK) goto err_free;
 
   *pdata = data;
 
   vapi_unlock();
   return ret;
 
- err_free:
+err_free:
   free(data);
- err:
+err:
   vapi_unlock();
   return ret;
 }
@@ -1008,17 +1035,19 @@ static int _hc_route_list_async(hc_sock_t *s) {
  *
  *----------------------------------------------------------------------------*/
 
-static int _hc_face_create(hc_sock_t *s, hc_face_t *face) {
-  ERROR("Face creation implemented.");
+static int _hc_face_create(hc_sock_t *socket, hc_face_t *face) {
+  ERROR("Face creation not implemented.");
   return -1;
 }
 
-static int _hc_face_get(hc_sock_t * socket, hc_face_t * face, hc_face_t ** face_found) {
+static int _hc_face_get(hc_sock_t *socket, hc_face_t *face,
+                        hc_face_t **face_found) {
   ERROR("Face deletion not implemented.");
   return -1;
 }
 
-static int _hc_face_delete(hc_sock_t *s, hc_face_t *face) {
+static int _hc_face_delete(hc_sock_t *s, hc_face_t *face,
+                           uint8_t delete_listener) {
   ERROR("Face deletion not implemented.");
   return -1;
 }
@@ -1030,9 +1059,7 @@ static int _hc_face_list(hc_sock_t *s, hc_data_t **pdata) {
   return -1;
 }
 
-static int _hc_face_list_async(hc_sock_t *s) {
-  return 0;
-}
+static int _hc_face_list_async(hc_sock_t *s) { return 0; }
 
 static int _hc_face_set_admin_state(
     hc_sock_t *s, const char *conn_id_or_name,  // XXX wrong identifier
@@ -1041,22 +1068,25 @@ static int _hc_face_set_admin_state(
 }
 
 #ifdef WITH_POLICY
-static int _hc_face_set_priority(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) {
+static int _hc_face_set_priority(hc_sock_t *s, const char *conn_id_or_name,
+                                 uint32_t priority) {
   ERROR("Face set priority not implemented.");
   return -1;
 }
 
-static int _hc_face_set_tags(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) {
+static int _hc_face_set_tags(hc_sock_t *s, const char *conn_id_or_name,
+                             policy_tags_t tags) {
   ERROR("Face set tags not implemented.");
   return -1;
 }
-#endif // WITH_POLICY
+#endif  // WITH_POLICY
 
 /*----------------------------------------------------------------------------*
  * Punting
  *----------------------------------------------------------------------------*/
 
-static int _hc_punting_create_internal(hc_sock_t *s, hc_punting_t *punting, bool async) {
+static int _hc_punting_create_internal(hc_sock_t *s, hc_punting_t *punting,
+                                       bool async) {
   return -1;
 }
 
@@ -1069,7 +1099,7 @@ static int _hc_punting_create_async(hc_sock_t *s, hc_punting_t *punting) {
 }
 
 static int _hc_punting_get(hc_sock_t *s, hc_punting_t *punting,
-                   hc_punting_t **punting_found) {
+                           hc_punting_t **punting_found) {
   ERROR("hc_punting_get not (yet) implemented.");
   return -1;
 }
@@ -1088,28 +1118,30 @@ static int _hc_punting_list(hc_sock_t *s, hc_data_t **pdata) {
  * Cache
  *----------------------------------------------------------------------------*/
 
-static int _hc_cache_set_store_internal(hc_sock_t *s, int enabled, bool async) {
+static int _hc_cache_set_store_internal(hc_sock_t *s, hc_cache_t *cache,
+                                        bool async) {
   return 0;
 }
 
-static int _hc_cache_set_store(hc_sock_t *s, int enabled) {
-  return _hc_cache_set_store_internal(s, enabled, false);
+static int _hc_cache_set_store(hc_sock_t *s, hc_cache_t *cache) {
+  return _hc_cache_set_store_internal(s, cache, false);
 }
 
-static int _hc_cache_set_store_async(hc_sock_t *s, int enabled) {
-  return _hc_cache_set_store_internal(s, enabled, true);
+static int _hc_cache_set_store_async(hc_sock_t *s, hc_cache_t *cache) {
+  return _hc_cache_set_store_internal(s, cache, true);
 }
 
-static int _hc_cache_set_serve_internal(hc_sock_t *s, int enabled, bool async) {
+static int _hc_cache_set_serve_internal(hc_sock_t *s, hc_cache_t *cache,
+                                        bool async) {
   return 0;
 }
 
-static int _hc_cache_set_serve(hc_sock_t *s, int enabled) {
-  return _hc_cache_set_serve_internal(s, enabled, false);
+static int _hc_cache_set_serve(hc_sock_t *s, hc_cache_t *cache) {
+  return _hc_cache_set_serve_internal(s, cache, false);
 }
 
-static int _hc_cache_set_serve_async(hc_sock_t *s, int enabled) {
-  return _hc_cache_set_serve_internal(s, enabled, true);
+static int _hc_cache_set_serve_async(hc_sock_t *s, hc_cache_t *cache) {
+  return _hc_cache_set_serve_internal(s, cache, true);
 }
 
 /*----------------------------------------------------------------------------*
@@ -1117,12 +1149,15 @@ static int _hc_cache_set_serve_async(hc_sock_t *s, int enabled) {
  *----------------------------------------------------------------------------*/
 
 // per prefix
-static int _hc_strategy_set(hc_sock_t *s /* XXX */) { return 0; }
+static int _hc_strategy_set(hc_sock_t *s, hc_strategy_t *strategy) { return 0; }
 
-static int _hc_strategy_list(hc_sock_t *s, hc_data_t **data) {
+static int _hc_strategy_add_local_prefix(hc_sock_t *s,
+                                         hc_strategy_t *strategy) {
   return 0;
 }
 
+static int _hc_strategy_list(hc_sock_t *s, hc_data_t **data) { return 0; }
+
 /*----------------------------------------------------------------------------*
  * WLDR
  *----------------------------------------------------------------------------*/
@@ -1138,9 +1173,11 @@ static int _hc_mapme_set(hc_sock_t *s, int enabled) { return 0; }
 
 static int _hc_mapme_set_discovery(hc_sock_t *s, int enabled) { return 0; }
 
-static int _hc_mapme_set_timescale(hc_sock_t *s, double timescale) { return 0; }
+static int _hc_mapme_set_timescale(hc_sock_t *s, uint32_t timescale) {
+  return 0;
+}
 
-static int _hc_mapme_set_retx(hc_sock_t *s, double timescale) { return 0; }
+static int _hc_mapme_set_retx(hc_sock_t *s, uint32_t timescale) { return 0; }
 
 /*----------------------------------------------------------------------------*
  * Policy
@@ -1150,51 +1187,99 @@ static int _hc_mapme_set_retx(hc_sock_t *s, double timescale) { return 0; }
 
 /* POLICY CREATE */
 
-static int _hc_policy_create_internal(hc_sock_t * socket, hc_policy_t * policy, bool async) {
+static int _hc_policy_create_internal(hc_sock_t *socket, hc_policy_t *policy,
+                                      bool async) {
   return -1;
 }
 
-static int
-_hc_policy_create(hc_sock_t * s, hc_policy_t * policy) {
+static int _hc_policy_create(hc_sock_t *s, hc_policy_t *policy) {
   return _hc_policy_create_internal(s, policy, false);
 }
 
-static int _hc_policy_create_async(hc_sock_t * s, hc_policy_t * policy) {
+static int _hc_policy_create_async(hc_sock_t *s, hc_policy_t *policy) {
   return _hc_policy_create_internal(s, policy, true);
 }
 
 /* POLICY DELETE */
 
-static int _hc_policy_delete_internal(hc_sock_t * socket, hc_policy_t * policy, bool async) {
+static int _hc_policy_delete_internal(hc_sock_t *socket, hc_policy_t *policy,
+                                      bool async) {
   return -1;
 }
 
-static int _hc_policy_delete(hc_sock_t * s, hc_policy_t * policy) {
+static int _hc_policy_delete(hc_sock_t *s, hc_policy_t *policy) {
   return _hc_policy_delete_internal(s, policy, false);
 }
 
-static int _hc_policy_delete_async(hc_sock_t * s, hc_policy_t * policy) {
+static int _hc_policy_delete_async(hc_sock_t *s, hc_policy_t *policy) {
   return _hc_policy_delete_internal(s, policy, true);
 }
 
 /* POLICY LIST */
 
-static int
-_hc_policy_list_internal(hc_sock_t * socket, hc_data_t ** pdata, bool async) {
+static int _hc_policy_list_internal(hc_sock_t *socket, hc_data_t **pdata,
+                                    bool async) {
   return -1;
 }
 
-static int _hc_policy_list(hc_sock_t * s, hc_data_t ** pdata) {
+static int _hc_policy_list(hc_sock_t *s, hc_data_t **pdata) {
   return _hc_policy_list_internal(s, pdata, false);
 }
 
-static int _hc_policy_list_async(hc_sock_t * s, hc_data_t ** pdata) {
+static int _hc_policy_list_async(hc_sock_t *s, hc_data_t **pdata) {
   return _hc_policy_list_internal(s, pdata, true);
 }
 
 #endif /* WITH_POLICY */
 
-static hc_sock_t hc_sock_vpp_interface = (hc_sock_t) {
+/*----------------------------------------------------------------------------*
+ * Configuration
+ *----------------------------------------------------------------------------*/
+
+typedef struct hc_result_s {
+  void *_;
+} hc_result_t;
+
+static hc_result_t *_hc_listener_create_conf(hc_sock_t *s,
+                                             hc_listener_t *listener) {
+  ERROR("Not implemented.");
+  return NULL;
+}
+static hc_result_t *_hc_connection_create_conf(hc_sock_t *s,
+                                               hc_connection_t *connection) {
+  ERROR("Not implemented.");
+  return NULL;
+}
+static hc_result_t *_hc_route_create_conf(hc_sock_t *s, hc_route_t *route) {
+  ERROR("Not implemented.");
+  return NULL;
+}
+static hc_result_t *_hc_strategy_set_conf(hc_sock_t *s,
+                                          hc_strategy_t *strategy) {
+  ERROR("Not implemented.");
+  return NULL;
+}
+static hc_result_t *_hc_strategy_add_local_prefix_conf(
+    hc_sock_t *s, hc_strategy_t *strategy) {
+  ERROR("Not implemented.");
+  return NULL;
+}
+
+hc_msg_t *_hc_result_get_msg(hc_result_t *result) {
+  ERROR("Not implemented.");
+  return NULL;
+}
+int _hc_result_get_cmd_id(hc_result_t *result) {
+  ERROR("Not implemented.");
+  return -1;
+}
+bool _hc_result_get_success(hc_result_t *result) {
+  ERROR("Not implemented.");
+  return false;
+}
+void _hc_result_free(hc_result_t *result) { free(result); }
+
+static hc_sock_t hc_sock_vpp_interface = (hc_sock_t){
     .hc_sock_get_next_seq = _hc_sock_vpp_get_next_seq,
     .hc_sock_set_nonblocking = _hc_sock_vpp_set_nonblocking,
     .hc_sock_get_fd = _hc_sock_vpp_get_fd,
@@ -1230,7 +1315,7 @@ static hc_sock_t hc_sock_vpp_interface = (hc_sock_t) {
     .hc_connection_set_priority_async = _hc_connection_set_priority_async,
     .hc_connection_set_tags = _hc_connection_set_tags,
     .hc_connection_set_tags_async = _hc_connection_set_tags_async,
-#endif // WITH_POLICY
+#endif  // WITH_POLICY
 
     .hc_face_create = _hc_face_create,
     .hc_face_get = _hc_face_get,
@@ -1242,7 +1327,7 @@ static hc_sock_t hc_sock_vpp_interface = (hc_sock_t) {
 #ifdef WITH_POLICY
     .hc_face_set_priority = _hc_face_set_priority,
     .hc_face_set_tags = _hc_face_set_tags,
-#endif // WITH_POLICY
+#endif  // WITH_POLICY
 
     .hc_route_create = _hc_route_create,
     .hc_route_create_async = _hc_route_create_async,
@@ -1264,6 +1349,7 @@ static hc_sock_t hc_sock_vpp_interface = (hc_sock_t) {
 
     .hc_strategy_list = _hc_strategy_list,
     .hc_strategy_set = _hc_strategy_set,
+    .hc_strategy_add_local_prefix = _hc_strategy_add_local_prefix,
     .hc_wldr_set = _hc_wldr_set,
 
     .hc_mapme_set = _hc_mapme_set,
@@ -1277,16 +1363,27 @@ static hc_sock_t hc_sock_vpp_interface = (hc_sock_t) {
     .hc_policy_delete = _hc_policy_delete,
     .hc_policy_delete_async = _hc_policy_delete_async,
     .hc_policy_list = _hc_policy_list,
-    .hc_policy_list_async = _hc_policy_list_async
-#endif // WITH_POLICY
+    .hc_policy_list_async = _hc_policy_list_async,
+#endif  // WITH_POLICY
+
+    .hc_listener_create_conf = _hc_listener_create_conf,
+    .hc_connection_create_conf = _hc_connection_create_conf,
+    .hc_route_create_conf = _hc_route_create_conf,
+    .hc_strategy_set_conf = _hc_strategy_set_conf,
+    .hc_strategy_add_local_prefix_conf = _hc_strategy_add_local_prefix_conf,
+
+    .hc_result_get_msg = _hc_result_get_msg,
+    .hc_result_get_cmd_id = _hc_result_get_cmd_id,
+    .hc_result_get_success = _hc_result_get_success,
+    .hc_result_free = _hc_result_free,
 };
 
 hc_sock_t *_hc_sock_create_url(const char *url) {
-  // NOT IMPLEMENTED
-  return NULL;
-}
+  if (url) {
+    // NOT IMPLEMENTED
+    return NULL;
+  }
 
-hc_sock_t *_hc_sock_create(void) {
   hc_sock_vpp_t *s = malloc(sizeof(hc_sock_vpp_t));
 
   if (!s) goto ERR_SOCK;
@@ -1302,4 +1399,4 @@ hc_sock_t *_hc_sock_create(void) {
 
 ERR_SOCK:
   return NULL;
-}
\ No newline at end of file
+}