[HICN-298] Release new hICN app for Android

Change-Id: I43adc62fadf00690b687078d739788dffdc5e566
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>

9 files changed, 449 insertions, 903 deletions

diff --git a/ctrl/libhicnctrl/src/CMakeLists.txt b/ctrl/libhicnctrl/src/CMakeLists.txt
index 204311c39..7b4413d55 100644
--- a/ctrl/libhicnctrl/src/CMakeLists.txt
+++ b/ctrl/libhicnctrl/src/CMakeLists.txt
@@ -11,11 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include(BuildMacros)
-
 list(APPEND COMPILER_DEFINITIONS
   "-DWITH_POLICY"
-#  "-DWITH_UPDATE"
 )
 
 set(HEADER_FILES
@@ -26,34 +23,34 @@ set(HEADER_FILES
 
 set(UTIL_HEADER_FILES
     face.h
-    util/ip_address.h
     util/log.h
-    util/policy.h
-    util/token.h
-    util/types.h
 )
 
 set(SOURCE_FILES
     api.c
-    util/policy.c
+    face.c
     util/log.c
 )
 
 set(LIBRARIES
     m
+    ${HICN_LIBRARIES}
 )
 
 set(INCLUDE_DIRS
     ./
     ../includes/
+    ${HICN_INCLUDE_DIRS}
 )
 
-if (ANDROID_API)
-    build_library(${LIBHICN_CTRL}
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+    set(HICN_LIBRARIES ${LIBHICN_STATIC})
+    build_library(${LIBHICNCTRL}
         STATIC
         SOURCES ${SOURCE_FILES}
         INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES}
         LINK_LIBRARIES ${LIBRARIES}
+        DEPENDS ${LIBHICN_STATIC}
         COMPONENT ${LIBHICNCTRL_COMPONENT}
         DEPENDS ${LIBHICN_STATIC}
         INCLUDE_DIRS ${INCLUDE_DIRS}
@@ -61,11 +58,12 @@ if (ANDROID_API)
         DEFINITIONS ${COMPILER_DEFINITIONS}
     )
 else ()
-    build_library(${LIBHICN_CTRL}
+    build_library(${LIBHICNCTRL}
         SHARED STATIC
         SOURCES ${SOURCE_FILES}
         INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES}
         LINK_LIBRARIES ${LIBRARIES}
+        DEPENDS ${LIBHICN_SHARED}
         COMPONENT ${LIBHICNCTRL_COMPONENT}
         DEPENDS ${LIBHICN_SHARED}
         INCLUDE_DIRS ${INCLUDE_DIRS}
@@ -74,14 +72,14 @@ else ()
     )
 endif ()
 
-if(NOT ANDROID_API AND NOT COMPILE_FOR_IOS)
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android" AND NOT COMPILE_FOR_IOS)
     list(APPEND DAEMON_SRC
       cli.c
     )
-    build_executable(${HICN_CTRL}
+    build_executable(${HICNCTRL}
       SOURCES ${DAEMON_SRC}
-      LINK_LIBRARIES ${LIBHICN_CTRL_SHARED}
-      DEPENDS ${LIBHICN_CTRL_SHARED}
+      LINK_LIBRARIES ${LIBHICNCTRL_SHARED} ${LIBHICN_SHARED}
+      DEPENDS ${LIBHICNCTRL_SHARED} ${LIBHICN_SHARED}
       COMPONENT ${LIBHICNCTRL_COMPONENT}
       INCLUDE_DIRS ${INCLUDE_DIRS}
       DEFINITIONS ${COMPILER_DEFINITIONS}
diff --git a/ctrl/libhicnctrl/src/api.c b/ctrl/libhicnctrl/src/api.c
index 3d8a2c166..769c96076 100644
--- a/ctrl/libhicnctrl/src/api.c
+++ b/ctrl/libhicnctrl/src/api.c
@@ -28,12 +28,21 @@
 
 #include <hicn/ctrl/api.h>
 #include <hicn/ctrl/commands.h>
+#include <hicn/util/token.h>
 #include "util/log.h"
-#include "util/token.h"
 #include <strings.h>
 
 #define PORT 9695
 
+#if 0
+#ifdef __APPLE__
+#define RANDBYTE() (u8)(arc4random() & 0xFF)
+#else
+#define RANDBYTE() (u8)(random() & 0xFF)
+#endif
+#endif
+#define RANDBYTE() (u8)(rand() & 0xFF)
+
 /*
  * list was working with all seq set to 0, but it seems hicnLightControl uses
  * 1, and replies with the same seqno
@@ -159,8 +168,8 @@ static const hc_connection_state_t map_from_list_connections_state[] = {
 };
 
 
-#define connection_state_to_face_state(x) ((face_state_t)x)
-#define face_state_to_connection_state(x) ((hc_connection_state_t)x)
+#define connection_state_to_face_state(x) ((face_state_t)(x))
+#define face_state_to_connection_state(x) ((hc_connection_state_t)(x))
 
 #define IS_VALID_ADDR_TYPE(x) ((x >= ADDR_INET) && (x <= ADDR_UNIX))
 
@@ -342,6 +351,8 @@ hc_sock_parse_url(const char * url, struct sockaddr * sa)
     /* FIXME URL parsing is currently not implemented */
     assert(!url);
 
+    srand(time(NULL));
+
     /*
      * A temporary solution is to inspect the sa_family fields of the passed in
      * sockaddr, which defaults to AF_UNSPEC (0) and thus creates an IPv4/TCP
@@ -443,7 +454,13 @@ ERR_PARSE:
 int
 hc_sock_send(hc_sock_t * s, hc_msg_t * msg, size_t msglen)
 {
-    return send(s->fd, msg, msglen, 0);
+    int rc;
+    rc = send(s->fd, msg, msglen, 0);
+    if (rc < 0) {
+        perror("hc_sock_send");
+        return -1;
+    }
+    return 0;
 }
 
 int
@@ -473,6 +490,7 @@ hc_sock_recv(hc_sock_t * s, hc_data_t * data)
         // XXX
     }
     if (rc < 0) {
+        perror("hc_sock_recv");
         /* Error occurred */
         // XXX check for EWOULDBLOCK;
         // XXX
@@ -647,7 +665,8 @@ hc_execute_command(hc_sock_t * s, hc_msg_t * msg, size_t msg_len,
     if (!data)
         goto ERR_DATA;
 
-    hc_sock_send(s, msg, msg_len);
+    if (hc_sock_send(s, msg, msg_len) < 0)
+        goto ERR_PROCESS;
     while(!data->complete) {
         if (hc_sock_recv(s, data) < 0)
             break;
@@ -667,52 +686,6 @@ ERR_DATA:
      return LIBHICNCTRL_FAILURE;
 }
 
-/* /!\ Please update constants in header file upon changes */
-int
-hc_url_snprintf(char * s, size_t size, int family,
-        const ip_address_t * ip_address, u16 port)
-{
-    char * cur = s;
-    int rc;
-
-    /* Other address are currently not supported */
-    if (!IS_VALID_FAMILY(family)) {
-        ERROR("Invalid family %d for IP address", family);
-        return -1;
-    }
-
-    rc = snprintf(cur, s + size - cur, "inet%c://",
-            (family == AF_INET) ? '4' : '6');
-    if (rc < 0)
-        return rc;
-    cur += rc;
-    if (size != 0 && cur >= s + size)
-        return cur - s;
-
-    rc = ip_address_snprintf(cur, s + size - cur, ip_address, family);
-    if (rc < 0)
-        return rc;
-    cur += rc;
-    if (size != 0 && cur >= s + size)
-        return cur - s;
-
-    rc = snprintf(cur, s + size - cur, ":");
-    if (rc < 0)
-        return rc;
-    cur += rc;
-    if (size != 0 && cur >= s + size)
-        return cur - s;
-
-    rc = snprintf(cur, s + size - cur, "%d", port);
-    if (rc < 0)
-        return rc;
-    cur += rc;
-    if (size != 0 && cur >= s + size)
-        return cur - s;
-
-    return cur - s;
-}
-
 /*----------------------------------------------------------------------------*
  * Listeners
  *----------------------------------------------------------------------------*/
@@ -750,9 +723,7 @@ hc_listener_create(hc_sock_t * s, hc_listener_t * listener)
     };
 
     snprintf(msg.payload.symbolic, NAME_LEN, "%s", listener->name);
-#ifdef __linux__
     snprintf(msg.payload.interfaceName, INTERFACE_LEN, "%s", listener->interface_name);
-#endif
 
     hc_command_params_t params = {
         .cmd = ACTION_CREATE,
@@ -772,13 +743,25 @@ hc_listener_get(hc_sock_t *s, hc_listener_t * listener,
         hc_listener_t ** listener_found)
 {
     hc_data_t * listeners;
+    hc_listener_t * found;
 
     if (hc_listener_list(s, &listeners) < 0)
         return LIBHICNCTRL_FAILURE;
 
     /* Test */
-    if (hc_listener_find(listeners, listener, listener_found) < 0)
+    if (hc_listener_find(listeners, listener, &found) < 0) {
+        hc_data_free(listeners);
         return LIBHICNCTRL_FAILURE;
+    }
+
+    if (found) {
+        *listener_found = malloc(sizeof(hc_listener_t));
+        if (!*listener_found)
+            return LIBHICNCTRL_FAILURE;
+        **listener_found = *found;
+    } else {
+        *listener_found = NULL;
+    }
 
     hc_data_free(listeners);
 
@@ -818,6 +801,7 @@ hc_listener_delete(hc_sock_t * s, hc_listener_t * listener)
             return LIBHICNCTRL_FAILURE;
         printf("Delete listener ID=%d\n", listener_found->id);
         snprintf(msg.payload.symbolicOrListenerid, NAME_LEN, "%d", listener_found->id);
+        free(listener_found);
     }
 
     hc_command_params_t params = {
@@ -879,6 +863,7 @@ hc_listener_cmp(const hc_listener_t * l1, const hc_listener_t * l2)
 {
     return ((l1->type == l2->type) &&
             (l1->family == l2->family) &&
+            (strncmp(l1->interface_name, l2->interface_name, INTERFACE_LEN) == 0) &&
             (ip_address_cmp(&l1->local_addr, &l2->local_addr, l1->family) == 0) &&
             (l1->local_port == l2->local_port))
         ? LIBHICNCTRL_SUCCESS
@@ -913,7 +898,8 @@ hc_listener_parse(void * in, hc_listener_t * listener)
         .local_addr = UNION_CAST(cmd->address, ip_address_t),
         .local_port = ntohs(cmd->port),
     };
-    memset(listener->name, 0, NAME_LEN);
+    snprintf(listener->name, NAME_LEN, "%s", cmd->listenerName);
+    snprintf(listener->interface_name, INTERFACE_LEN, "%s", cmd->interfaceName);
     return LIBHICNCTRL_SUCCESS;
 }
 
@@ -925,14 +911,15 @@ GENERATE_FIND(listener)
 int
 hc_listener_snprintf(char * s, size_t size, hc_listener_t * listener)
 {
-    char local[MAXSZ_HC_URL];
+    char local[MAXSZ_URL];
     int rc;
-    rc = hc_url_snprintf(local, MAXSZ_HC_URL,
+    rc = url_snprintf(local, MAXSZ_URL,
          listener->family, &listener->local_addr, listener->local_port);
     if (rc < 0)
         return rc;
 
-    return snprintf(s, size+17, "%s %s",
+    return snprintf(s, size+17, "%s %s %s",
+            listener->interface_name,
             local,
             connection_type_str[listener->type]);
 }
@@ -993,13 +980,25 @@ hc_connection_get(hc_sock_t *s, hc_connection_t * connection,
         hc_connection_t ** connection_found)
 {
     hc_data_t * connections;
+    hc_connection_t * found;
 
     if (hc_connection_list(s, &connections) < 0)
         return LIBHICNCTRL_FAILURE;
 
     /* Test */
-    if (hc_connection_find(connections, connection, connection_found) < 0)
+    if (hc_connection_find(connections, connection, &found) < 0) {
+        hc_data_free(connections);
         return LIBHICNCTRL_FAILURE;
+    }
+
+    if (found) {
+        *connection_found = malloc(sizeof(hc_connection_t));
+        if (!*connection_found)
+            return LIBHICNCTRL_FAILURE;
+        **connection_found = *found;
+    } else {
+        *connection_found = NULL;
+    }
 
     hc_data_free(connections);
 
@@ -1039,6 +1038,7 @@ hc_connection_delete(hc_sock_t * s, hc_connection_t * connection)
             return LIBHICNCTRL_FAILURE;
         printf("Delete connection ID=%d\n", connection_found->id);
         snprintf(msg.payload.symbolicOrConnid, NAME_LEN, "%d", connection_found->id);
+        free(connection_found);
     }
 
     hc_command_params_t params = {
@@ -1158,6 +1158,7 @@ hc_connection_parse(void * in, hc_connection_t * connection)
         .state = state,
     };
     snprintf(connection->name, NAME_LEN, "%s", cmd->connectionData.symbolic);
+    snprintf(connection->interface_name, INTERFACE_LEN, "%s", cmd->interfaceName);
     return LIBHICNCTRL_SUCCESS;
 }
 
@@ -1169,23 +1170,24 @@ GENERATE_FIND(connection)
 int
 hc_connection_snprintf(char * s, size_t size, const hc_connection_t * connection)
 {
-    char local[MAXSZ_HC_URL];
-    char remote[MAXSZ_HC_URL];
+    char local[MAXSZ_URL];
+    char remote[MAXSZ_URL];
     int rc;
 
     // assert(connection->connection_state)
 
-    rc = hc_url_snprintf(local, MAXSZ_HC_URL, connection->family,
+    rc = url_snprintf(local, MAXSZ_URL, connection->family,
             &connection->local_addr, connection->local_port);
     if (rc < 0)
         return rc;
-    rc = hc_url_snprintf(remote, MAXSZ_HC_URL, connection->family,
+    rc = url_snprintf(remote, MAXSZ_URL, connection->family,
             &connection->remote_addr, connection->remote_port);
     if (rc < 0)
         return rc;
 
-    return snprintf(s, size, "%s %s %s %s",
+    return snprintf(s, size, "%s %s %s %s %s",
             connection_state_str[connection->state],
+            connection->interface_name,
             local,
             remote,
             connection_type_str[connection->type]);
@@ -1195,7 +1197,7 @@ hc_connection_snprintf(char * s, size_t size, const hc_connection_t * connection
 
 int
 hc_connection_set_admin_state(hc_sock_t * s, const char * conn_id_or_name,
-        hc_connection_state_t admin_state)
+        face_state_t state)
 {
     struct {
         header_control_message hdr;
@@ -1208,7 +1210,7 @@ hc_connection_set_admin_state(hc_sock_t * s, const char * conn_id_or_name,
             .seqNum = s->send_seq,
         },
         .payload = {
-            .admin_state = admin_state,
+            .admin_state = state,
         },
     };
     snprintf(msg.payload.symbolicOrConnid, NAME_LEN, "%s", conn_id_or_name);
@@ -1436,13 +1438,12 @@ hc_face_to_connection(const hc_face_t * face, hc_connection_t * connection, bool
 
     switch(f->type) {
         case FACE_TYPE_HICN:
-            /* FIXME truncations, collisions, ... */
             *connection = (hc_connection_t) {
                 .type = CONNECTION_TYPE_HICN,
-                .family = f->params.hicn.family,
-                .local_addr = f->params.hicn.local_addr,
+                .family = f->family,
+                .local_addr = f->local_addr,
                 .local_port = 0,
-                .remote_addr = f->params.hicn.remote_addr,
+                .remote_addr = f->remote_addr,
                 .remote_port = 0,
                 .admin_state = face_state_to_connection_state(f->admin_state),
                 .state = face_state_to_connection_state(f->state),
@@ -1451,16 +1452,18 @@ hc_face_to_connection(const hc_face_t * face, hc_connection_t * connection, bool
 #endif /* WITH_POLICY */
             };
             snprintf(connection->name, NAME_LEN, "%s",
-                    f->params.hicn.netdevice.name);
+                    f->netdevice.name);
+            snprintf(connection->interface_name, INTERFACE_LEN, "%s",
+                    f->netdevice.name);
             break;
         case FACE_TYPE_TCP:
             *connection = (hc_connection_t) {
                 .type = CONNECTION_TYPE_TCP,
-                .family = f->params.hicn.family,
-                .local_addr = f->params.tunnel.local_addr,
-                .local_port = f->params.tunnel.local_port,
-                .remote_addr = f->params.tunnel.remote_addr,
-                .remote_port = f->params.tunnel.remote_port,
+                .family = f->family,
+                .local_addr = f->local_addr,
+                .local_port = f->local_port,
+                .remote_addr = f->remote_addr,
+                .remote_port = f->remote_port,
                 .admin_state = face_state_to_connection_state(f->admin_state),
                 .state = face_state_to_connection_state(f->state),
 #ifdef WITH_POLICY
@@ -1468,23 +1471,21 @@ hc_face_to_connection(const hc_face_t * face, hc_connection_t * connection, bool
 #endif /* WITH_POLICY */
             };
             if (generate_name) {
-#ifdef __APPLE__
-                snprintf(connection->name, NAME_LEN, "tcp%d", arc4random() & 0xFF);
-#else
-                snprintf(connection->name, NAME_LEN, "tcp%ld", random() & 0xFF);
-#endif
+                snprintf(connection->name, NAME_LEN, "tcp%u", RANDBYTE());
             } else {
                 memset(connection->name, 0, NAME_LEN);
             }
+            snprintf(connection->interface_name, INTERFACE_LEN, "%s",
+                    f->netdevice.name);
             break;
         case FACE_TYPE_UDP:
             *connection = (hc_connection_t) {
                 .type = CONNECTION_TYPE_UDP,
                 .family = AF_INET,
-                .local_addr = f->params.tunnel.local_addr,
-                .local_port = f->params.tunnel.local_port,
-                .remote_addr = f->params.tunnel.remote_addr,
-                .remote_port = f->params.tunnel.remote_port,
+                .local_addr = f->local_addr,
+                .local_port = f->local_port,
+                .remote_addr = f->remote_addr,
+                .remote_port = f->remote_port,
                 .admin_state = face_state_to_connection_state(f->admin_state),
                 .state = face_state_to_connection_state(f->state),
 #ifdef WITH_POLICY
@@ -1492,20 +1493,21 @@ hc_face_to_connection(const hc_face_t * face, hc_connection_t * connection, bool
 #endif /* WITH_POLICY */
             };
             if (generate_name) {
-#ifdef __APPLE__
-                snprintf(connection->name, NAME_LEN, "udp%d", arc4random() & 0xFF);
-#else
-                snprintf(connection->name, NAME_LEN, "udp%ld", random() & 0xFF);
-#endif
+                snprintf(connection->name, NAME_LEN, "udp%u", RANDBYTE());
             } else {
                 memset(connection->name, 0, NAME_LEN);
             }
+            snprintf(connection->interface_name, INTERFACE_LEN, "%s",
+                    f->netdevice.name);
             break;
         default:
              return LIBHICNCTRL_FAILURE;
     }
 
-     return LIBHICNCTRL_SUCCESS;
+    snprintf(connection->interface_name, INTERFACE_LEN, "%s",
+            f->netdevice.name);
+
+    return LIBHICNCTRL_SUCCESS;
 }
 
 /* CONNECTION -> FACE */
@@ -1519,13 +1521,11 @@ hc_connection_to_face(const hc_connection_t * connection, hc_face_t * face)
                 .id = connection->id,
                 .face = {
                     .type = FACE_TYPE_TCP,
-                    .params.tunnel = {
-                        .family = connection->family,
-                        .local_addr = connection->local_addr,
-                        .local_port = connection->local_port,
-                        .remote_addr = connection->remote_addr,
-                        .remote_port = connection->remote_port,
-                    },
+                    .family = connection->family,
+                    .local_addr = connection->local_addr,
+                    .local_port = connection->local_port,
+                    .remote_addr = connection->remote_addr,
+                    .remote_port = connection->remote_port,
                     .admin_state = connection_state_to_face_state(connection->admin_state),
                     .state = connection_state_to_face_state(connection->state),
 #ifdef WITH_POLICY
@@ -1539,13 +1539,11 @@ hc_connection_to_face(const hc_connection_t * connection, hc_face_t * face)
                 .id = connection->id,
                 .face = {
                     .type = FACE_TYPE_UDP,
-                    .params.tunnel = {
-                        .family = connection->family,
-                        .local_addr = connection->local_addr,
-                        .local_port = connection->local_port,
-                        .remote_addr = connection->remote_addr,
-                        .remote_port = connection->remote_port,
-                    },
+                    .family = connection->family,
+                    .local_addr = connection->local_addr,
+                    .local_port = connection->local_port,
+                    .remote_addr = connection->remote_addr,
+                    .remote_port = connection->remote_port,
                     .admin_state = connection_state_to_face_state(connection->admin_state),
                     .state = connection_state_to_face_state(connection->state),
 #ifdef WITH_POLICY
@@ -1559,12 +1557,10 @@ hc_connection_to_face(const hc_connection_t * connection, hc_face_t * face)
                 .id = connection->id,
                 .face = {
                     .type = FACE_TYPE_HICN,
-                    .params.hicn = {
-                        .family = connection->family,
-                        .netdevice.index = NETDEVICE_UNDEFINED_INDEX, // XXX
-                        .local_addr = connection->local_addr,
-                        .remote_addr = connection->remote_addr,
-                    },
+                    .family = connection->family,
+                    .netdevice.index = NETDEVICE_UNDEFINED_INDEX, // XXX
+                    .local_addr = connection->local_addr,
+                    .remote_addr = connection->remote_addr,
                     .admin_state = connection_state_to_face_state(connection->admin_state),
                     .state = connection_state_to_face_state(connection->state),
 #ifdef WITH_POLICY
@@ -1576,7 +1572,11 @@ hc_connection_to_face(const hc_connection_t * connection, hc_face_t * face)
         default:
             return LIBHICNCTRL_FAILURE;
     }
+    face->face.netdevice.name[0] = '\0';
+    face->face.netdevice.index = 0;
     snprintf(face->name, NAME_LEN, "%s", connection->name);
+    snprintf(face->face.netdevice.name, INTERFACE_LEN, "%s", connection->interface_name);
+    netdevice_update_index(&face->face.netdevice);
     return LIBHICNCTRL_SUCCESS;
 }
 
@@ -1592,6 +1592,8 @@ hc_connection_to_local_listener(const hc_connection_t * connection, hc_listener_
         .local_addr = connection->local_addr,
         .local_port = connection->local_port,
     };
+    snprintf(listener->name, NAME_LEN, "lst%u", RANDBYTE()); // generate name
+    snprintf(listener->interface_name, INTERFACE_LEN, "%s", connection->interface_name);
     return LIBHICNCTRL_SUCCESS;
 }
 
@@ -1631,8 +1633,11 @@ hc_face_create(hc_sock_t * s, hc_face_t * face)
                 /* We need to create the listener if it does not exist */
                 if (hc_listener_create(s, &listener) < 0) {
                     ERROR("[hc_face_create] Could not create listener.");
+                    free(listener_found);
                     return LIBHICNCTRL_FAILURE;
                 }
+            } else {
+                free(listener_found);
             }
 
             /* Create corresponding connection */
@@ -1656,6 +1661,7 @@ hc_face_create(hc_sock_t * s, hc_face_t * face)
             }
 
             face->id = connection_found->id;
+            free(connection_found);
 
             break;
 
@@ -1674,6 +1680,7 @@ hc_face_create(hc_sock_t * s, hc_face_t * face)
             break;
         default:
             ERROR("[hc_face_create] Unknwon face type.");
+
             return LIBHICNCTRL_FAILURE;
     };
 
@@ -1702,7 +1709,9 @@ hc_face_get(hc_sock_t * s, hc_face_t * face, hc_face_t ** face_found)
                 *face_found = NULL;
                 return LIBHICNCTRL_SUCCESS;
             }
+            *face_found = malloc(sizeof(face_t));
             hc_connection_to_face(connection_found, *face_found);
+            free(connection_found);
             break;
 
         case FACE_TYPE_HICN_LISTENER:
@@ -1716,7 +1725,9 @@ hc_face_get(hc_sock_t * s, hc_face_t * face, hc_face_t ** face_found)
                 *face_found = NULL;
                 return LIBHICNCTRL_SUCCESS;
             }
+            *face_found = malloc(sizeof(face_t));
             hc_listener_to_face(listener_found, *face_found);
+            free(listener_found);
             break;
 
         default:
@@ -1776,6 +1787,71 @@ ERR:
 int
 hc_face_snprintf(char * s, size_t size, hc_face_t * face)
 {
+    /* URLs are also big enough to contain IP addresses in the hICN case */
+    char local[MAXSZ_URL];
+    char remote[MAXSZ_URL];
+#ifdef WITH_POLICY
+    char tags[MAXSZ_POLICY_TAGS];
+#endif /* WITH_POLICY */
+    int rc;
+
+    switch(face->face.type) {
+        case FACE_TYPE_HICN:
+        case FACE_TYPE_HICN_LISTENER:
+            rc = ip_address_snprintf(local, MAXSZ_URL,
+                    &face->face.local_addr,
+                    face->face.family);
+            if (rc < 0)
+                return rc;
+            rc = ip_address_snprintf(remote, MAXSZ_URL,
+                    &face->face.remote_addr,
+                    face->face.family);
+            if (rc < 0)
+                return rc;
+            break;
+        case FACE_TYPE_TCP:
+        case FACE_TYPE_UDP:
+        case FACE_TYPE_TCP_LISTENER:
+        case FACE_TYPE_UDP_LISTENER:
+            rc = url_snprintf(local, MAXSZ_URL, face->face.family,
+                    &face->face.local_addr,
+                    face->face.local_port); if (rc < 0)
+                return rc;
+            rc = url_snprintf(remote, MAXSZ_URL, face->face.family,
+                    &face->face.remote_addr,
+                    face->face.remote_port); if (rc < 0)
+            if (rc < 0)
+                return rc;
+            break;
+        default:
+            return LIBHICNCTRL_FAILURE;
+    }
+
+    // [#ID NAME] TYPE LOCAL_URL REMOTE_URL STATE/ADMIN_STATE (TAGS)
+#ifdef WITH_POLICY
+    rc = policy_tags_snprintf(tags, MAXSZ_POLICY_TAGS, face->face.tags);
+    if (rc < 0)
+        return rc;
+
+    return snprintf(s, size, "[#%d %s] %s %s %s %s/%s (%s)",
+            face->id,
+            face->name,
+            face_type_str[face->face.type],
+            local,
+            remote,
+            face_state_str[face->face.state],
+            face_state_str[face->face.admin_state],
+            tags);
+#else
+    return snprintf(s, size, "[#%d %s] %s %s %s %s/%s",
+            face->id,
+            face->name,
+            face_type_str[face->face.type],
+            local,
+            remote,
+            face_state_str[face->face.state],
+            face_state_str[face->face.admin_state]);
+#endif /* WITH_POLICY */
     return LIBHICNCTRL_SUCCESS;
 }
 
@@ -1783,7 +1859,7 @@ int
 hc_face_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, // XXX wrong identifier
         face_state_t admin_state)
 {
-    return hc_connection_set_admin_state(s, conn_id_or_name, (hc_connection_state_t)admin_state);
+    return hc_connection_set_admin_state(s, conn_id_or_name, admin_state);
 }
 
 /*----------------------------------------------------------------------------*
diff --git a/ctrl/libhicnctrl/src/cli.c b/ctrl/libhicnctrl/src/cli.c
index 70620a84f..6798b5aec 100644
--- a/ctrl/libhicnctrl/src/cli.c
+++ b/ctrl/libhicnctrl/src/cli.c
@@ -22,9 +22,8 @@
 #include <unistd.h> // getopt
 
 #include <hicn/ctrl.h>
-
-#include "util/ip_address.h"
-#include "util/token.h"
+#include <hicn/util/ip_address.h>
+#include <hicn/util/token.h>
 
 
 #define die(LABEL, MESSAGE) do {    \
diff --git a/ctrl/libhicnctrl/src/face.c b/ctrl/libhicnctrl/src/face.c
index 9e0fbb597..41ff58f81 100644
--- a/ctrl/libhicnctrl/src/face.c
+++ b/ctrl/libhicnctrl/src/face.c
@@ -21,10 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <hicn/util/token.h>
 
-#include "face.h"
+#include <hicn/ctrl/face.h>
 #include "util/hash.h"
-#include "util/token.h"
 
 #define member_size(type, member) sizeof(((type *)0)->member)
 
@@ -37,6 +37,112 @@ foreach_netdevice_type
 #undef _
 };
 
+netdevice_t *
+netdevice_create_from_index(u32 index)
+{
+    netdevice_t * netdevice = malloc(sizeof(netdevice_t));
+    if (!netdevice)
+        goto ERR_MALLOC;
+
+    int rc = netdevice_set_index(netdevice, index);
+    if (rc < 0)
+        goto ERR_INIT;
+
+    return netdevice;
+
+ERR_INIT:
+    free(netdevice);
+ERR_MALLOC:
+    return NULL;
+}
+
+netdevice_t *
+netdevice_create_from_name(const char * name)
+{
+    netdevice_t * netdevice = malloc(sizeof(netdevice_t));
+    if (!netdevice)
+        goto ERR_MALLOC;
+
+    int rc = netdevice_set_name(netdevice, name);
+    if (rc < 0)
+        goto ERR_INIT;
+
+    return netdevice;
+
+ERR_INIT:
+    free(netdevice);
+ERR_MALLOC:
+    return NULL;
+}
+
+/**
+ * \brief Update the index of the netdevice based on the name
+ */
+int
+netdevice_update_index(netdevice_t * netdevice)
+{
+    netdevice->index = if_nametoindex(netdevice->name);
+    if (netdevice->index == 0)
+        return -1;
+    return 0;
+}
+
+int
+netdevice_update_name(netdevice_t * netdevice)
+{
+    if (!if_indextoname(netdevice->index, netdevice->name))
+        return -1;
+    return 0;
+}
+
+void
+netdevice_free(netdevice_t * netdevice)
+{
+    free(netdevice);
+}
+
+int
+netdevice_get_index(const netdevice_t * netdevice, u32 * index)
+{
+    if (netdevice->index == 0)
+        return -1;
+    *index = netdevice->index;
+    return 0;
+}
+
+int
+netdevice_set_index(netdevice_t * netdevice, u32 index)
+{
+    netdevice->index = index;
+    return netdevice_update_name(netdevice);
+}
+
+int
+netdevice_get_name(const netdevice_t * netdevice, const char ** name)
+{
+    if (netdevice->name[0] == '\0')
+        return -1;
+    *name = netdevice->name;
+    return 0;
+}
+
+int
+netdevice_set_name(netdevice_t * netdevice, const char * name)
+{
+    int rc = snprintf(netdevice->name, IFNAMSIZ, "%s", name);
+    if (rc < 0)
+        return -1;
+    if (rc >= IFNAMSIZ)
+        return -2; /* truncated */
+    return netdevice_update_index(netdevice);
+}
+
+int
+netdevice_cmp(const netdevice_t * nd1, const netdevice_t * nd2)
+{
+    return (nd1->index - nd2->index);
+}
+
 
 /* Face state */
 
@@ -61,33 +167,42 @@ foreach_face_type
 int
 face_initialize(face_t * face)
 {
-    bzero(face, sizeof(face_t)); /* 0'ed for hash */
+    memset(face, 0, sizeof(face_t)); /* 0'ed for hash */
     return 1;
 }
 
 int
-face_initialize_udp(face_t * face, const ip_address_t * local_addr,
-        u16 local_port, const ip_address_t * remote_addr, u16 remote_port,
+face_initialize_udp(face_t * face, const char * interface_name, const
+        ip_address_t * local_addr, u16 local_port,
+        const ip_address_t * remote_addr, u16 remote_port,
         int family)
 {
+    if (!local_addr)
+        return -1;
+
     *face = (face_t) {
         .type = FACE_TYPE_UDP,
-        .params.tunnel = {
-            .family = family,
-            .local_addr = *local_addr,
-            .local_port = local_port,
-            .remote_addr = *remote_addr,
-            .remote_port = remote_port,
-        },
+        .family = family,
+        .local_addr = *local_addr,
+        .local_port = local_port,
+        .remote_addr = remote_addr ? *remote_addr : IP_ADDRESS_EMPTY,
+        .remote_port = remote_port,
     };
+
+    snprintf(face->netdevice.name, IFNAMSIZ, "%s", interface_name);
+
     return 1;
 }
 
 int
-face_initialize_udp_sa(face_t * face, const struct sockaddr * local_addr,
+face_initialize_udp_sa(face_t * face, const char * interface_name,
+        const struct sockaddr * local_addr,
         const struct sockaddr * remote_addr)
 {
-    if (local_addr->sa_family != remote_addr->sa_family)
+    if (!local_addr)
+        return -1;
+
+    if (remote_addr && (local_addr->sa_family != remote_addr->sa_family))
         return -1;
 
     switch (local_addr->sa_family) {
@@ -97,14 +212,14 @@ face_initialize_udp_sa(face_t * face, const struct sockaddr * local_addr,
             struct sockaddr_in *rsai = (struct sockaddr_in *)remote_addr;
             *face = (face_t) {
                 .type = FACE_TYPE_UDP,
-                .params.tunnel = {
-                    .family = AF_INET,
-                    .local_addr.v4.as_inaddr = lsai->sin_addr,
-                    .local_port = ntohs(lsai->sin_port),
-                    .remote_addr.v4.as_inaddr = rsai->sin_addr,
-                    .remote_port = ntohs(rsai->sin_port),
-                },
+                .family = AF_INET,
+                .local_addr.v4.as_inaddr = lsai->sin_addr,
+                .local_port = lsai ? ntohs(lsai->sin_port) : 0,
+                .remote_addr = IP_ADDRESS_EMPTY,
+                .remote_port = rsai ? ntohs(rsai->sin_port) : 0,
             };
+            if (rsai)
+                face->remote_addr.v4.as_inaddr = rsai->sin_addr;
             }
             break;
         case AF_INET6:
@@ -113,19 +228,22 @@ face_initialize_udp_sa(face_t * face, const struct sockaddr * local_addr,
             struct sockaddr_in6 *rsai = (struct sockaddr_in6 *)remote_addr;
             *face = (face_t) {
                 .type = FACE_TYPE_UDP,
-                .params.tunnel = {
-                    .family = AF_INET6,
-                    .local_addr.v6.as_in6addr = lsai->sin6_addr,
-                    .local_port = ntohs(lsai->sin6_port),
-                    .remote_addr.v6.as_in6addr = rsai->sin6_addr,
-                    .remote_port = ntohs(rsai->sin6_port),
-                },
+                .family = AF_INET6,
+                .local_addr.v6.as_in6addr = lsai->sin6_addr,
+                .local_port = lsai ? ntohs(lsai->sin6_port) : 0,
+                .remote_addr = IP_ADDRESS_EMPTY,
+                .remote_port = rsai ? ntohs(rsai->sin6_port) : 0,
             };
+            if (rsai)
+                face->remote_addr.v6.as_in6addr = rsai->sin6_addr;
             }
             break;
         default:
             return -1;
     }
+
+    snprintf(face->netdevice.name, IFNAMSIZ, "%s", interface_name);
+
     return 1;
 }
 
@@ -135,11 +253,12 @@ face_t * face_create()
     return face;
 }
 
-face_t * face_create_udp(const ip_address_t * local_addr, u16 local_port,
+face_t * face_create_udp(const char * interface_name,
+        const ip_address_t * local_addr, u16 local_port,
         const ip_address_t * remote_addr, u16 remote_port, int family)
 {
     face_t * face = face_create();
-    if (face_initialize_udp(face, local_addr, local_port, remote_addr, remote_port, family) < 0)
+    if (face_initialize_udp(face, interface_name, local_addr, local_port, remote_addr, remote_port, family) < 0)
         goto ERR_INIT;
     return face;
 
@@ -148,11 +267,12 @@ ERR_INIT:
     return NULL;
 }
 
-face_t * face_create_udp_sa(const struct sockaddr * local_addr,
+face_t * face_create_udp_sa(const char * interface_name,
+        const struct sockaddr * local_addr,
         const struct sockaddr * remote_addr)
 {
     face_t * face = face_create();
-    if (face_initialize_udp_sa(face, local_addr, remote_addr) < 0)
+    if (face_initialize_udp_sa(face, interface_name, local_addr, remote_addr) < 0)
         goto ERR_INIT;
     return face;
 
@@ -166,10 +286,6 @@ void face_free(face_t * face)
     free(face);
 }
 
-#define face_param_cmp(f1, f2, face_param_type)            \
-    memcmp(&f1->type, &f2->type,  \
-            member_size(face_params_t, face_param_type));
-
 /**
  * \brief Compare two faces
  * \param [in] f1 - First face
@@ -182,18 +298,61 @@ void face_free(face_t * face)
 int
 face_cmp(const face_t * f1, const face_t * f2)
 {
-    if (f1->type != f2->type)
-        return false;
+
+    int ret = f1->type - f2->type;
+    if (ret != 0)
+        return ret;
+
+    ret = f1->family - f2->family;
+    if (ret != 0)
+        return ret;
+
+    /*
+     * FIXME As hicn-light API might not return the netdevice, we can discard the
+     * comparison when one of the two is not set for now...
+     */
+    if ((f1->netdevice.index != 0) && (f2->netdevice.index != 0)) {
+        ret = netdevice_cmp(&f1->netdevice, &f2->netdevice);
+        if (ret != 0)
+            return ret;
+    }
 
     switch(f1->type) {
         case FACE_TYPE_HICN:
-            return face_param_cmp(f1, f2, hicn);
+            ret = ip_address_cmp(&f1->local_addr, &f2->local_addr, f1->family);
+            if (ret != 0)
+                return ret;
+
+            ret = ip_address_cmp(&f1->remote_addr, &f2->remote_addr, f1->family);
+            if (ret != 0)
+                return ret;
+
+            break;
+
         case FACE_TYPE_TCP:
         case FACE_TYPE_UDP:
-            return face_param_cmp(f1, f2, tunnel);
+            ret = ip_address_cmp(&f1->local_addr, &f2->local_addr, f1->family);
+            if (ret != 0)
+                return ret;
+
+            ret = f1->local_port - f2->local_port;
+            if (ret != 0)
+                return ret;
+
+            ret = ip_address_cmp(&f1->remote_addr, &f2->remote_addr, f1->family);
+            if (ret != 0)
+                return ret;
+
+            ret = f1->remote_port - f2->remote_port;
+            if (ret != 0)
+                return ret;
+
+            break;
         default:
-            return false;
+            break;
     }
+
+    return 0;
 }
 
 hash_t
@@ -209,34 +368,59 @@ face_snprintf(char * s, size_t size, const face_t * face)
 {
     switch(face->type) {
         case FACE_TYPE_HICN:
-            return 0; // XXX Not implemented
+        {
+            char local[MAXSZ_IP_ADDRESS];
+            char remote[MAXSZ_IP_ADDRESS];
+            char tags[MAXSZ_POLICY_TAGS];
+
+            ip_address_snprintf(local, MAXSZ_IP_ADDRESS,
+                    &face->local_addr,
+                    face->family);
+            ip_address_snprintf(remote, MAXSZ_IP_ADDRESS,
+                    &face->remote_addr,
+                    face->family);
+            policy_tags_snprintf(tags, MAXSZ_POLICY_TAGS, face->tags);
+            return snprintf(s, size, "%s [%s -> %s] [%s]",
+                    face_type_str[face->type],
+                    local,
+                    remote,
+                    tags);
+        }
+        case FACE_TYPE_UNDEFINED:
         case FACE_TYPE_TCP:
         case FACE_TYPE_UDP:
-            {
-                char local[MAXSZ_IP_ADDRESS];
-                char remote[MAXSZ_IP_ADDRESS];
-
-                ip_address_snprintf(local, MAXSZ_IP_ADDRESS,
-                        &face->params.tunnel.local_addr,
-                        face->params.tunnel.family);
-                ip_address_snprintf(remote, MAXSZ_IP_ADDRESS,
-                        &face->params.tunnel.remote_addr,
-                        face->params.tunnel.family);
-
-                return snprintf(s, size, "%s [%s:%d -> %s:%d]",
-                        face_type_str[face->type],
-                        local,
-                        face->params.tunnel.local_port,
-                        remote,
-                        face->params.tunnel.remote_port);
-            }
-            break;
+        {
+            char local[MAXSZ_IP_ADDRESS];
+            char remote[MAXSZ_IP_ADDRESS];
+            char tags[MAXSZ_POLICY_TAGS];
+
+            ip_address_snprintf(local, MAXSZ_IP_ADDRESS,
+                    &face->local_addr,
+                    face->family);
+            ip_address_snprintf(remote, MAXSZ_IP_ADDRESS,
+                    &face->remote_addr,
+                    face->family);
+            policy_tags_snprintf(tags, MAXSZ_POLICY_TAGS, face->tags);
+
+            return snprintf(s, size, "%s [%s:%d -> %s:%d] [%s]",
+                    face_type_str[face->type],
+                    local,
+                    face->local_port,
+                    remote,
+                    face->remote_port,
+                    tags);
+        }
         default:
-            return 0;
+            return -1;
     }
 
 }
 
+policy_tags_t face_get_tags(const face_t * face)
+{
+    return face->tags;
+}
+
 int
 face_set_tags(face_t * face, policy_tags_t tags)
 {
diff --git a/ctrl/libhicnctrl/src/util/ip_address.h b/ctrl/libhicnctrl/src/util/ip_address.h
deleted file mode 100644
index 472cceeea..000000000
--- a/ctrl/libhicnctrl/src/util/ip_address.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * \file ip_address.h
- * \brief IP address type support
- */
-#ifndef UTIL_IP_ADDRESS_H
-#define UTIL_IP_ADDRESS_H
-
-#include <arpa/inet.h>  // inet_ntop
-#ifdef __APPLE__
-#include <libkern/OSByteOrder.h>
-#define __bswap_constant_32(x) OSSwapInt32(x)
-#include <machine/endian.h>
-#else
-#ifdef __ANDROID__
-#include <byteswap.h>
-#endif
-#include <endian.h>
-#endif
-#include <errno.h>
-#include <netdb.h> // struct addrinfo
-#include <netinet/in.h> // INET*_ADDRSTRLEN, IN*ADDR_LOOPBACK
-#include <stdlib.h>
-#include <string.h> // memset
-
-#include "types.h"
-
-
-#define bytes_to_bits(x) (x * 8)
-#define IPV6_ADDR_LEN 16	/* bytes */
-#define IPV4_ADDR_LEN 4		/* bytes */
-#define IPV6_ADDR_LEN_BITS bytes_to_bits(IPV6_ADDR_LEN)
-#define IPV4_ADDR_LEN_BITS bytes_to_bits(IPV4_ADDR_LEN)
-
-#define IP_MAX_ADDR_LEN IPV6_ADDR_LEN
-
-#define DUMMY_PORT 1234
-
-typedef union {
-    union {
-        struct in_addr as_inaddr;
-        u8 as_u8[4];
-        u16 as_u16[2];
-        u32 as_u32;
-    } v4;
-    union {
-        struct in6_addr as_in6addr;
-        u8 as_u8[16];
-        u16 as_u16[8];
-        u32 as_u32[4];
-        u64 as_u64[2];
-    } v6;
-    u8 buffer[IP_MAX_ADDR_LEN];
-    u8 as_u8[IP_MAX_ADDR_LEN];
-    u16 as_u16[IP_MAX_ADDR_LEN >> 1];
-    u32 as_u32[IP_MAX_ADDR_LEN >> 2];
-    u64 as_u64[IP_MAX_ADDR_LEN >> 3];
-} ip_address_t;
-
-#define MAXSZ_IP4_ADDRESS_ INET_ADDRSTRLEN - 1
-#define MAXSZ_IP6_ADDRESS_ INET6_ADDRSTRLEN - 1
-#define MAXSZ_IP_ADDRESS_ MAXSZ_IP6_ADDRESS_
-#define MAXSZ_IP4_ADDRESS MAXSZ_IP4_ADDRESS_ + 1
-#define MAXSZ_IP6_ADDRESS MAXSZ_IP6_ADDRESS_ + 1
-#define MAXSZ_IP_ADDRESS MAXSZ_IP_ADDRESS_ + 1
-
-
-typedef struct {
-  int family;
-  ip_address_t address;
-  u8 len;
-} ip_prefix_t;
-
-#define MAXSZ_PREFIX_ MAXSZ_IP_ADDRESS_ + 1 + 3
-#define MAXSZ_PREFIX MAXSZ_PREFIX_ + 1
-
-/* No htonl() with const */
-static const ip_address_t IPV4_LOOPBACK = {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#ifdef __ANDROID__
-    .v4.as_inaddr.s_addr = bswap_32(INADDR_LOOPBACK),
-#else
-    .v4.as_inaddr.s_addr = __bswap_constant_32(INADDR_LOOPBACK),
-#endif
-#else
-    .v4.as_inaddr.s_addr = INADDR_LOOPBACK,
-#endif
-};
-
-static const ip_address_t IPV6_LOOPBACK = {
-    .v6.as_in6addr = IN6ADDR_LOOPBACK_INIT,
-};
-
-static const ip_address_t IPV4_ANY = {
-    .v4.as_inaddr.s_addr = INADDR_ANY,
-};
-
-static const ip_address_t IPV6_ANY = {
-    .v6.as_in6addr = IN6ADDR_ANY_INIT,
-};
-
-#define IP_ANY(family) (family == AF_INET) ? IPV4_ANY : IPV6_ANY
-
-#define MAX_PORT 1 << (8 * sizeof(u16))
-#define IS_VALID_PORT(x) ((x > 0) && (x < MAX_PORT))
-
-#define MAXSZ_PORT_ 5
-#define MAXSZ_PORT MAXSZ_PORT_ + 1
-
-#define IS_VALID_FAMILY(x) ((x == AF_INET) || (x == AF_INET6))
-
-static inline
-int
-ip_address_get_family (const char * ip_address)
-{
-  struct addrinfo hint, *res = NULL;
-  int rc;
-
-  memset (&hint, '\0', sizeof hint);
-
-  hint.ai_family = PF_UNSPEC;
-  hint.ai_flags = AI_NUMERICHOST;
-
-  rc = getaddrinfo (ip_address, NULL, &hint, &res);
-  if (rc)
-    {
-      return -1;
-    }
-  rc = res->ai_family;
-  freeaddrinfo (res);
-  return rc;
-}
-
-static inline
-int
-ip_address_len (const ip_address_t * ip_address, int family)
-{
-  return (family == AF_INET6) ? IPV6_ADDR_LEN :
-    (family == AF_INET) ? IPV4_ADDR_LEN : 0;
-}
-
-static inline
-int
-ip_address_ntop (const ip_address_t * ip_address, char *dst, const size_t len,
-		int family)
-{
-  const char * s = inet_ntop (family, ip_address->buffer, dst, len);
-  return (s ? 1 : -1);
-}
-
-/*
- * Parse ip addresses in presentation format
- */
-static inline
-int
-ip_address_pton (const char *ip_address_str, ip_address_t * ip_address)
-{
-  int pton_fd;
-  char *addr = strdup (ip_address_str);
-  int family;
-
-
-  family = ip_address_get_family (addr);
-
-  switch (family)
-    {
-    case AF_INET6:
-      pton_fd = inet_pton (AF_INET6, addr, &ip_address->buffer);
-      break;
-    case AF_INET:
-      pton_fd = inet_pton (AF_INET, addr, &ip_address->buffer);
-      break;
-    default:
-      goto ERR;
-    }
-
-  //   0 = not in presentation format
-  // < 0 = other error (use perror)
-  if (pton_fd <= 0)
-    {
-      goto ERR;
-    }
-
-  return 1;
-ERR:
-  free (addr);
-  return -1;
-}
-
-
-
-static inline
-int
-ip_address_snprintf(char * s, size_t size, const ip_address_t * ip_address, int family)
-{
-    size_t len = family == AF_INET ? INET_ADDRSTRLEN : INET6_ADDRSTRLEN;
-    const char * rc = inet_ntop (family, ip_address->buffer, s, len);
-    return rc ? strlen(rc) : -1;
-}
-
-
-static inline
-int
-ip_address_to_sockaddr(const ip_address_t * ip_address,
-		struct sockaddr *sockaddr_address, int family)
-{
-  struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *) sockaddr_address;
-  struct sockaddr_in *tmp4 = (struct sockaddr_in *) sockaddr_address;
-
-  switch (family)
-    {
-    case AF_INET6:
-      tmp6->sin6_family = AF_INET6;
-      tmp6->sin6_port = DUMMY_PORT;
-      tmp6->sin6_scope_id = 0;
-      memcpy (&tmp6->sin6_addr, ip_address->buffer, IPV6_ADDR_LEN);
-      break;
-    case AF_INET:
-      tmp4->sin_family = AF_INET;
-      tmp4->sin_port = DUMMY_PORT;
-      memcpy (&tmp4->sin_addr, ip_address->buffer, IPV4_ADDR_LEN);
-      break;
-    default:
-      return -1;
-    }
-
-  return 1;
-}
-
-static inline
-int
-ip_address_cmp(const ip_address_t * ip1, const ip_address_t * ip2, int family)
-{
-    return memcmp(ip1, ip2, ip_address_len(ip1, family));
-}
-
-/* Parse IP Prefixes in presentation format (in bits, separated by a slash) */
-static inline
-int
-ip_prefix_pton (const char *ip_address_str, ip_prefix_t * ip_prefix)
-{
-  int pton_fd;
-  char *p;
-  char *eptr;
-  char *addr = strdup (ip_address_str);
-
-  p = strchr (addr, '/');
-  if (!p)
-    {
-      ip_prefix->len = 0;		// until we get the ip address family
-    }
-  else
-    {
-      ip_prefix->len = strtoul (p + 1, &eptr, 10);
-      *p = 0;
-    }
-
-  ip_prefix->family = ip_address_get_family (addr);
-
-  switch (ip_prefix->family)
-    {
-    case AF_INET6:
-      if (ip_prefix->len > IPV6_ADDR_LEN_BITS)
-	goto ERR;
-      pton_fd = inet_pton (AF_INET6, addr, &ip_prefix->address.buffer);
-      break;
-    case AF_INET:
-      if (ip_prefix->len > IPV4_ADDR_LEN_BITS)
-	goto ERR;
-      pton_fd = inet_pton (AF_INET, addr, &ip_prefix->address.buffer);
-      break;
-    default:
-      goto ERR;
-    }
-
-  //   0 = not in presentation format
-  // < 0 = other error (use perror)
-  if (pton_fd <= 0)
-    {
-      goto ERR;
-    }
-
-  return 1;
-ERR:
-  free (addr);
-  return -1;
-}
-
-static inline
-int
-ip_prefix_ntop (const ip_prefix_t * ip_prefix, char *dst, size_t size)
-{
-  char ip_s[MAXSZ_IP_ADDRESS];
-  const char * s = inet_ntop (ip_prefix->family, ip_prefix->address.buffer, ip_s, MAXSZ_IP_ADDRESS);
-  if (!s)
-      return -1;
-  size_t n = snprintf(dst, size, "%s/%d", ip_s, ip_prefix->len);
-
-  return (n > 0 ? 1 : -1);
-}
-
-#endif /* UTIL_IP_ADDRESS_H */
diff --git a/ctrl/libhicnctrl/src/util/policy.c b/ctrl/libhicnctrl/src/util/policy.c
deleted file mode 100644
index 90dbc72cd..000000000
--- a/ctrl/libhicnctrl/src/util/policy.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * \file policy.h
- * \brief Implementation of policy description
- */
-
-#include <stdio.h>
-#include "policy.h"
-
-const char * policy_tag_str[] = {
-    #define _(x) [POLICY_TAG_ ## x] = STRINGIZE(x),
-    foreach_policy_tag
-    #undef _
-};
-
-const char * policy_state_str[] = {
-    #define _(x) [POLICY_STATE_ ## x] = STRINGIZE(x),
-    foreach_policy_state
-    #undef _
-};
-
-int
-policy_tag_state_snprintf(char * s, size_t size, const policy_tag_state_t * tag_state)
-{
-    char *cur = s;
-    int rc;
-
-    if (tag_state->disabled > 1)
-        return -1;
-
-    rc = snprintf(cur, s + size - cur, "%s%s", (tag_state->disabled == 1) ? "!" : "", policy_state_str[tag_state->state]);
-    if (rc < 0)
-        return rc;
-    cur += rc;
-    if (size != 0 && cur >= s + size)
-        return cur - s;
-
-    return cur - s;
-}
diff --git a/ctrl/libhicnctrl/src/util/policy.h b/ctrl/libhicnctrl/src/util/policy.h
deleted file mode 100644
index 231e53f73..000000000
--- a/ctrl/libhicnctrl/src/util/policy.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * \file policy.h
- * \brief Policy description
- */
-#ifndef HICN_POLICY_H
-#define HICN_POLICY_H
-
-#include <netinet/in.h> // INET*_ADDRSTRLEN
-#include "token.h"
-
-/* POLICY TAG */
-
-#define foreach_policy_tag      \
-    /* Interface type */        \
-    _(WIRED)                    \
-    _(WIFI)                     \
-    _(CELLULAR)                 \
-    /* QoS */                   \
-    _(BEST_EFFORT)              \
-    _(REALTIME)                 \
-    _(MULTIPATH)                \
-    /* Security */              \
-    _(TRUSTED)
-
-typedef enum {
-#define _(x) POLICY_TAG_ ## x,
-foreach_policy_tag
-#undef _
-    POLICY_TAG_N
-} policy_tag_t;
-
-#define MAXSZ_POLICY_TAG_ 11
-#define MAXSZ_POLICY_TAG MAXSZ_POLICY_TAG_ + 1
-
-extern const char * policy_tag_str[];
-
-
-/* POLICY_TAGS */
-
-typedef int policy_tags_t;
-
-static inline
-void policy_tags_add(policy_tags_t * tags, policy_tag_t tag)
-{
-    *tags |= (1 << tag);
-}
-
-static inline
-void policy_tags_remove(policy_tags_t * tags, policy_tag_t tag)
-{
-    *tags &= ~(1 << tag);
-}
-
-static inline
-int policy_tags_has(policy_tags_t tags, policy_tag_t tag)
-{
-    return tags & (1 << tag);
-}
-
-#define POLICY_TAGS_EMPTY 0
-
-
-/* POLICY STATE */
-
-/* TODO vs. weight */
-
-#define foreach_policy_state    \
-    _(NEUTRAL)                  \
-    _(REQUIRE)                  \
-    _(PREFER)                   \
-    _(AVOID)                    \
-    _(PROHIBIT)                 \
-    _(N)
-
-typedef enum {
-#define _(x) POLICY_STATE_ ## x,
-foreach_policy_state
-#undef _
-} policy_state_t;
-
-#define MAXSZ_POLICY_STATE_ 8
-#define MAXSZ_POLICY_STATE MAXSZ_POLICY_STATE_ + 1
-
-extern const char * policy_state_str[];
-
-
-/* POLICY TAG STATE */
-
-typedef struct {
-    policy_state_t state;
-    uint8_t disabled;
-} policy_tag_state_t;
-
-#define MAXSZ_POLICY_TAG_STATE_ 8
-#define MAXSZ_POLICY_TAG_STATE MAXSZ_POLICY_TAG_STATE_ + 1
-
-int policy_tag_state_snprintf(char * s, size_t size, const policy_tag_state_t * tag_state);
-
-
-/* INTERFACE STATS */
-
-typedef struct {
-    float throughput;
-    float latency;
-    float loss_rate;
-} interface_stats_t;
-
-#define INTERFACE_STATS_NONE {                          \
-    .throughput = 0,                                    \
-    .latency = 0,                                       \
-    .loss_rate = 0,                                     \
-}
-
-
-/* POLICY STATS */
-
-typedef struct {
-    interface_stats_t wired;
-    interface_stats_t wifi;
-    interface_stats_t cellular;
-    interface_stats_t all;
-} policy_stats_t;
-
-#define POLICY_STATS_NONE {                     \
-    .wired    = INTERFACE_STATS_NONE,           \
-    .wifi     = INTERFACE_STATS_NONE,           \
-    .cellular = INTERFACE_STATS_NONE,           \
-    .all      = INTERFACE_STATS_NONE,           \
-}
-
-typedef struct {
-    uint32_t num_packets;
-    uint32_t num_bytes;
-    uint32_t num_losses;
-    uint32_t latency_idle;
-} interface_counters_t;
-
-#define INTERFACE_COUNTERS_NONE {               \
-    .num_packets = 0,                           \
-    .num_bytes = 0,                             \
-    .num_losses = 0,                            \
-    .latency_idle = 0,                          \
-}
-
-typedef struct {
-    interface_counters_t wired;
-    interface_counters_t wifi;
-    interface_counters_t cellular;
-    interface_counters_t all;
-    uint64_t last_update;
-} policy_counters_t;
-
-#define POLICY_COUNTERS_NONE (policy_counters_t) {      \
-    .wired    = INTERFACE_COUNTERS_NONE,                \
-    .wifi     = INTERFACE_COUNTERS_NONE,                \
-    .cellular = INTERFACE_COUNTERS_NONE,                \
-    .all      = INTERFACE_COUNTERS_NONE,                \
-    .last_update = 0,                                   \
-}
-
-/* POLICY */
-
-#define APP_NAME_LEN 128
-
-typedef struct {
-    char app_name[APP_NAME_LEN];
-    policy_tag_state_t tags[POLICY_TAG_N];
-    policy_stats_t stats;
-} policy_t;
-
-static const policy_t POLICY_NONE = {
-    .app_name = { 0 },
-    .tags = {
-#define _(x) [POLICY_TAG_ ## x] = { POLICY_STATE_NEUTRAL, 0 },
-foreach_policy_tag
-#undef _
-    },
-    .stats = POLICY_STATS_NONE,
-};
-
-
-/* POLICY DESCRIPTION */
-
-#define PFX_STRLEN 4 /* eg. /128 */
-
-typedef struct {
-    int family;
-    union {
-        char ipv4_prefix[INET_ADDRSTRLEN + PFX_STRLEN];
-        char ipv6_prefix[INET6_ADDRSTRLEN + PFX_STRLEN];
-    };
-    policy_t policy;
-} policy_description_t;
-
-/* DEFAULT POLICY */
-
-static const policy_description_t default_policy[] = {
-    {
-        .family = AF_INET6,
-        .ipv6_prefix = "a001::/16",
-        .policy = {
-            .app_name = "Webex",
-            .tags  = {
-                [POLICY_TAG_WIRED]       = { POLICY_STATE_PREFER,   0 },
-                [POLICY_TAG_WIFI]        = { POLICY_STATE_NEUTRAL,  0 },
-                [POLICY_TAG_CELLULAR]    = { POLICY_STATE_AVOID,    1 },
-                [POLICY_TAG_BEST_EFFORT] = { POLICY_STATE_PROHIBIT, 0 },
-                [POLICY_TAG_REALTIME]    = { POLICY_STATE_REQUIRE,  1 },
-                [POLICY_TAG_MULTIPATH]   = { POLICY_STATE_AVOID,    0 },
-                [POLICY_TAG_TRUSTED]     = { POLICY_STATE_REQUIRE,  1 },
-            },
-            .stats = POLICY_STATS_NONE,
-        },
-    },
-    {
-        .family = AF_INET6,
-        .ipv6_prefix = "b001::/16",
-        .policy = {
-            .app_name = "Video Streaming",
-            .tags  = {
-                [POLICY_TAG_WIRED]       = { POLICY_STATE_PREFER,   0 },
-                [POLICY_TAG_WIFI]        = { POLICY_STATE_NEUTRAL,  0 },
-                [POLICY_TAG_CELLULAR]    = { POLICY_STATE_NEUTRAL,  0 },
-                [POLICY_TAG_BEST_EFFORT] = { POLICY_STATE_PROHIBIT, 0 },
-                [POLICY_TAG_REALTIME]    = { POLICY_STATE_REQUIRE,  0 },
-                [POLICY_TAG_MULTIPATH]   = { POLICY_STATE_AVOID,    0 },
-                [POLICY_TAG_TRUSTED]     = { POLICY_STATE_PREFER,   0 },
-            },
-            .stats = POLICY_STATS_NONE,
-        },
-    },
-    {
-        .family = AF_INET6,
-        .ipv6_prefix = "c001::/16",
-        .policy = {
-            .app_name = "*",
-            .tags  = {
-                [POLICY_TAG_WIRED]       = { POLICY_STATE_PREFER,   0 },
-                [POLICY_TAG_WIFI]        = { POLICY_STATE_NEUTRAL,  0 },
-                [POLICY_TAG_CELLULAR]    = { POLICY_STATE_NEUTRAL,  0 },
-                [POLICY_TAG_BEST_EFFORT] = { POLICY_STATE_PROHIBIT, 0 },
-                [POLICY_TAG_REALTIME]    = { POLICY_STATE_REQUIRE,  0 },
-                [POLICY_TAG_MULTIPATH]   = { POLICY_STATE_AVOID,    0 },
-                [POLICY_TAG_TRUSTED]     = { POLICY_STATE_PROHIBIT, 1 },
-            },
-            .stats = POLICY_STATS_NONE,
-        },
-    },
-};
-
-#endif /* HICN_POLICY_H */
diff --git a/ctrl/libhicnctrl/src/util/token.h b/ctrl/libhicnctrl/src/util/token.h
deleted file mode 100644
index 43e0a77b2..000000000
--- a/ctrl/libhicnctrl/src/util/token.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* Token concatenation */
-
-/*
- * Concatenate preprocessor tokens A and B without expanding macro definitions
- * (however, if invoked from a macro, macro arguments are expanded).
- */
-#define PPCAT_NX(A, B) A ## B
-
-/*
- * Concatenate preprocessor tokens A and B after macro-expanding them.
- */
-#define PPCAT(A, B) PPCAT_NX(A, B)
-
-/* Token stringification */
-
-/*
- * Turn A into a string literal without expanding macro definitions
- * (however, if invoked from a macro, macro arguments are expanded).
- */
-#define STRINGIZE_NX(A) #A
-
-/*
- * Turn A into a string literal after macro-expanding it.
- */
-#define STRINGIZE(A) STRINGIZE_NX(A)
diff --git a/ctrl/libhicnctrl/src/util/types.h b/ctrl/libhicnctrl/src/util/types.h
deleted file mode 100644
index 10a0bdca0..000000000
--- a/ctrl/libhicnctrl/src/util/types.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017-2019 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef UTIL_TYPES
-#define UTIL_TYPES
-
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-/* Helper for avoiding warnings about type-punning */
-#define UNION_CAST(x, destType) \
-   (((union {__typeof__(x) a; destType b;})x).b)
-
-typedef unsigned int hash_t;
-
-typedef int (*cmp_t)(const void *, const void *);
-
-/* Enums */
-
-#define IS_VALID_ENUM_TYPE(NAME, x) ((x > NAME ## _UNDEFINED) && (x < NAME ## _N))
-
-#endif /* UTIL_TYPES */