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, 89 insertions, 404 deletions

diff --git a/lib/src/name.c b/lib/src/name.c
index 54b2a76aa..3bdcbbdb4 100644
--- a/lib/src/name.c
+++ b/lib/src/name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 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:
@@ -19,522 +19,210 @@
  */
 
 #ifndef _WIN32
-#include <arpa/inet.h>          // inet_ptin
+#include <arpa/inet.h> // inet_ptin
 #endif
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>             // strtoul
-#include <string.h>             // memcpy
+#include <stdlib.h> // strtoul
+#include <string.h> // memcpy
 
 #include <hicn/common.h>
 #include <hicn/error.h>
 #include <hicn/name.h>
+#include <hicn/util/sstrncpy.h>
 
-#if ! HICN_VPP_PLUGIN
 int
-hicn_name_create (const char *ip_address, u32 id, hicn_name_t * name)
+hicn_name_create (const char *ip_address, u32 id, hicn_name_t *name)
 {
   int af, rc;
 
-  af = get_addr_family (ip_address);
-
-  switch (af)
-    {
-    case AF_INET:
-      if (name->type == HNT_UNSPEC)
-        {
-          name->type = HNT_CONTIGUOUS_V4;
-        }
-      name->len = IPV4_ADDR_LEN;
-      break;
-    case AF_INET6:
-      if (name->type == HNT_UNSPEC)
-        {
-          name->type = HNT_CONTIGUOUS_V6;
-        }
-      name->len = IPV6_ADDR_LEN;
-      break;
-    default:
-      return HICN_LIB_ERROR_INVALID_IP_ADDRESS;
-    }
+  memset (name, 0, sizeof (hicn_name_t));
 
-  if ((name->type != HNT_CONTIGUOUS_V4) && (name->type != HNT_CONTIGUOUS_V6))
-    {
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
+  af = get_addr_family (ip_address);
+  int v4 = (af == AF_INET);
+  u8 *dst = (u8 *) (v4 * (intptr_t) (name->prefix.v4.as_u8) +
+		    (1 - v4) * (intptr_t) (name->prefix.v6.as_u8));
+  rc = inet_pton (af, ip_address, dst);
 
-  rc = inet_pton (af, ip_address, name->buffer);
-  if (rc <= 0)
+  if (rc != 1)
     {
       return HICN_LIB_ERROR_UNKNOWN_ADDRESS;
     }
-  *(u32 *) (name->buffer + name->len) = id;
+
+  name->suffix = id;
 
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_create_from_ip_prefix (const ip_prefix_t * prefix, u32 id,
-                                  hicn_name_t * name)
+hicn_name_create_from_ip_prefix (const ip_prefix_t *prefix, u32 id,
+				 hicn_name_t *name)
 {
-  switch (prefix->family)
-    {
-      case AF_INET:
-        name->type = HNT_CONTIGUOUS_V4;
-        memcpy (name->buffer, prefix->address.v4.buffer,
-                ip_address_len(prefix->family));
-        name->len = IPV4_ADDR_LEN;
-        break;
-      case AF_INET6:
-        name->type = HNT_CONTIGUOUS_V6;
-        memcpy (name->buffer, prefix->address.v6.buffer,
-                ip_address_len(prefix->family));
-        name->len = IPV6_ADDR_LEN;
-        break;
-      default:
-        return HICN_LIB_ERROR_INVALID_IP_ADDRESS;
-    }
-
-  *(u32 *) (name->buffer + name->len) = id;
+  name->prefix.v6.as_u64[0] = prefix->address.v6.as_u64[0];
+  name->prefix.v6.as_u64[1] = prefix->address.v6.as_u64[1];
+  name->suffix = id;
 
   return HICN_LIB_ERROR_NONE;
 }
 
-u8
-hicn_name_get_length (const hicn_name_t * name)
-{
-  return name->len;
-}
-
 int
-hicn_name_compare (const hicn_name_t * name_1, const hicn_name_t * name_2,
-                   bool consider_segment)
+hicn_name_compare (const hicn_name_t *name_1, const hicn_name_t *name_2,
+		   bool consider_segment)
 {
-  hicn_name_t *name1 = (hicn_name_t *) name_1;
-  hicn_name_t *name2 = (hicn_name_t *) name_2;
-
-  if ((name1->type == HNT_CONTIGUOUS_V4 && name2->type == HNT_CONTIGUOUS_V6)
-      || (name1->type == HNT_CONTIGUOUS_V6
-          && name2->type == HNT_CONTIGUOUS_V4))
-    {
-      return -1;
-    }
-
-  if ((name1->type == HNT_IOV_V4 && name2->type == HNT_IOV_V6) ||
-      (name1->type == HNT_IOV_V6 && name2->type == HNT_IOV_V4))
-    {
-      return -1;
-    }
-
-  if ((name1->type == HNT_IOV_V4 && name2->type == HNT_CONTIGUOUS_V6) ||
-      (name1->type == HNT_IOV_V6 && name2->type == HNT_CONTIGUOUS_V4))
-    {
-      return -1;
-    }
-
-  if (name1->type == HNT_UNSPEC || name2->type == HNT_UNSPEC)
-    {
-      return -1;
-    }
-
-  size_t len1 = 0, len2 = 0;
+  int ret;
+  ret = memcmp (&name_1->prefix.v6.buffer, &name_2->prefix.v6.buffer,
+		sizeof (name_1->prefix.v6));
 
-  u8 *buffer11, *buffer12, *buffer21, *buffer22;
+  if (consider_segment)
+    ret |= !(name_1->suffix == name_2->suffix);
 
-  switch (name1->type)
-    {
-    case HNT_CONTIGUOUS_V4:
-      buffer11 = name1->buffer;
-      buffer12 = name1->buffer + IPV4_ADDR_LEN;
-      len1 = IPV4_ADDR_LEN;
-      break;
-    case HNT_CONTIGUOUS_V6:
-      buffer11 = name1->buffer;
-      buffer12 = name1->buffer + IPV6_ADDR_LEN;
-      len1 = IPV6_ADDR_LEN;
-      break;
-    case HNT_IOV_V4:
-      buffer11 = name1->iov.buffers[0].iov_base;
-      buffer12 = name1->iov.buffers[1].iov_base;
-      len1 = IPV4_ADDR_LEN;
-      break;
-    case HNT_IOV_V6:
-      buffer11 = name1->iov.buffers[0].iov_base;
-      buffer12 = name1->iov.buffers[1].iov_base;
-      len1 = IPV6_ADDR_LEN;
-      break;
-    default:
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
-
-  switch (name2->type)
-    {
-    case HNT_CONTIGUOUS_V4:
-      buffer21 = name2->buffer;
-      buffer22 = name2->buffer + IPV4_ADDR_LEN;
-      len2 = IPV4_ADDR_LEN;
-      break;
-    case HNT_CONTIGUOUS_V6:
-      buffer21 = name2->buffer;
-      buffer22 = name2->buffer + IPV6_ADDR_LEN;
-      len2 = IPV6_ADDR_LEN;
-      break;
-    case HNT_IOV_V4:
-      buffer21 = name2->iov.buffers[0].iov_base;
-      buffer22 = name2->iov.buffers[1].iov_base;
-      len2 = IPV4_ADDR_LEN;
-      break;
-    case HNT_IOV_V6:
-      buffer21 = name2->iov.buffers[0].iov_base;
-      buffer22 = name2->iov.buffers[1].iov_base;
-      len2 = IPV6_ADDR_LEN;
-      break;
-    default:
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
-
-  // Sanity check
-  if (len1 != len2)
-    {
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
-
-  int ret1 = memcmp ((u8 *) buffer11, (u8 *) buffer21, len1);
-
-  if (!consider_segment)
-    {
-      return ret1;
-    }
-
-  int ret2 = memcmp ((u8 *) buffer12, (u8 *) buffer22, HICN_SEGMENT_LEN);
-
-  return ret1 || ret2;
+  return ret;
 }
 
 int
-hicn_name_hash (const hicn_name_t * name, u32 * hash, bool consider_suffix)
+hicn_name_hash (const hicn_name_t *name, u32 *hash, bool consider_suffix)
 {
-  switch (name->type)
-    {
-    case HNT_CONTIGUOUS_V4:
-      *hash = hash32 (name->buffer, consider_suffix ? HICN_V4_NAME_LEN : HICN_V4_PREFIX_LEN);
-      break;
-    case HNT_CONTIGUOUS_V6:
-      *hash = hash32 (name->buffer, consider_suffix ? HICN_V6_NAME_LEN : HICN_V6_PREFIX_LEN);
-      break;
-    case HNT_IOV_V4:
-    case HNT_IOV_V6:
-      *hash =
-	hash32 (name->iov.buffers[0].iov_base, name->iov.buffers[0].iov_len);
-      if (consider_suffix)
-        {
-          *hash = cumulative_hash32 (name->iov.buffers[1].iov_base,
-			      name->iov.buffers[1].iov_len, *hash);
-        }
-      break;
-    default:
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
+  *hash = hash32 (&name->prefix, sizeof (name->prefix));
+
+  if (consider_suffix)
+    *hash = cumulative_hash32 (&name->suffix, sizeof (name->suffix), *hash);
 
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_empty (hicn_name_t * name)
+hicn_name_empty (hicn_name_t *name)
 {
-  return name->type == HNT_UNSPEC ? 1 : 0;
+  return _is_unspec (name);
 }
 
 int
-hicn_name_copy (hicn_name_t * dst, const hicn_name_t * src)
+hicn_name_copy (hicn_name_t *dst, const hicn_name_t *src)
 {
-  switch (src->type)
-    {
-    case HNT_CONTIGUOUS_V4:
-    case HNT_CONTIGUOUS_V6:
-      *dst = *src;
-      break;
-    case HNT_IOV_V4:
-    case HNT_IOV_V6:
-      dst->type =
-        src->type == HNT_IOV_V4 ? HNT_CONTIGUOUS_V4 : HNT_CONTIGUOUS_V6;
-      memcpy (dst->buffer, src->iov.buffers[0].iov_base,
-              src->iov.buffers[0].iov_len);
-      memcpy (dst->buffer + src->iov.buffers[0].iov_len,
-              src->iov.buffers[1].iov_base, src->iov.buffers[1].iov_len);
-      break;
-    default:
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
-
+  *dst = *src;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_copy_to_destination (u8 * dst, const hicn_name_t * src,
-                               bool copy_suffix)
+hicn_name_copy_prefix_to_destination (u8 *dst, const hicn_name_t *name)
 {
-  size_t length;
-
-  switch (src->type)
-    {
-    case HNT_CONTIGUOUS_V4:
-      if (copy_suffix)
-        {
-          length = HICN_V4_NAME_LEN;
-        }
-      else
-        {
-          length = IPV4_ADDR_LEN;
-        }
-      memcpy (dst, src->buffer, length);
-      break;
-    case HNT_CONTIGUOUS_V6:
-      if (copy_suffix)
-        {
-          length = HICN_V6_NAME_LEN;
-        }
-      else
-        {
-          length = IPV6_ADDR_LEN;
-        }
-      memcpy (dst, src->buffer, length);
-      break;
-    case HNT_IOV_V4:
-    case HNT_IOV_V6:
-      memcpy (dst, src->iov.buffers[0].iov_base, src->iov.buffers[0].iov_len);
-      if (copy_suffix)
-        {
-          memcpy (dst + src->iov.buffers[0].iov_len,
-                  src->iov.buffers[1].iov_base, src->iov.buffers[1].iov_len);
-        }
-      break;
-    default:
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
+  int v4 = _is_inet4 (name);
+  const u8 *src = (u8 *) (v4 * (intptr_t) (name->prefix.v4.as_u8) +
+			  (1 - v4) * (intptr_t) (name->prefix.v6.as_u8));
+  size_t size = v4 * IPV4_ADDR_LEN + (1 - v4) * IPV6_ADDR_LEN;
+  memcpy (dst, src, size);
 
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_set_seq_number (hicn_name_t * name, u32 seq_number)
+hicn_name_set_seq_number (hicn_name_t *name, u32 seq_number)
 {
-  u8 *sequence_number = NULL;
-
-  switch (name->type)
-    {
-    case HNT_CONTIGUOUS_V6:
-      sequence_number = name->buffer + IPV6_ADDR_LEN;
-      break;
-    case HNT_CONTIGUOUS_V4:
-      sequence_number = name->buffer + IPV4_ADDR_LEN;
-      break;
-    case HNT_IOV_V6:
-    case HNT_IOV_V4:
-      sequence_number = name->iov.buffers[1].iov_base;
-      break;
-    case HNT_UNSPEC:
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
-
-  if (sequence_number)
-    {
-      *(u32 *) sequence_number = seq_number;
-    }
-  else
-    {
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
-
+  name->suffix = seq_number;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_to_sockaddr_address (const hicn_name_t * name,
-                               struct sockaddr *ip_address)
+hicn_name_to_sockaddr_address (const hicn_name_t *name,
+			       struct sockaddr *ip_address)
 {
   struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *) ip_address;
   struct sockaddr_in *tmp4 = (struct sockaddr_in *) ip_address;
 
-  switch (name->type)
+  assert (!_is_unspec (name));
+
+  if (_is_inet4 (name))
+    {
+      tmp4->sin_family = AF_INET;
+      tmp4->sin_port = DUMMY_PORT;
+      memcpy (&tmp4->sin_addr, &name->prefix.v4, IPV4_ADDR_LEN);
+    }
+  else
     {
-    case HNT_CONTIGUOUS_V6:
-      tmp6->sin6_family = AF_INET6;
-      tmp6->sin6_scope_id = 0;
-      tmp6->sin6_port = DUMMY_PORT;
-      memcpy (&tmp6->sin6_addr, name->buffer, IPV6_ADDR_LEN);
-      break;
-    case HNT_IOV_V6:
       tmp6->sin6_family = AF_INET6;
       tmp6->sin6_scope_id = 0;
       tmp6->sin6_port = DUMMY_PORT;
-      memcpy (&tmp6->sin6_addr, name->iov.buffers[0].iov_base,
-              name->iov.buffers[0].iov_len);
-      break;
-    case HNT_CONTIGUOUS_V4:
-      tmp4->sin_family = AF_INET;
-      tmp4->sin_port = DUMMY_PORT;
-      memcpy (&tmp4->sin_addr, name->buffer, IPV4_ADDR_LEN);
-      break;
-    case HNT_IOV_V4:
-      tmp4->sin_family = AF_INET;
-      tmp4->sin_port = DUMMY_PORT;
-      memcpy (&tmp4->sin_addr, name->iov.buffers[0].iov_base,
-              name->iov.buffers[0].iov_len);
-      break;
-    default:
-      return HICN_LIB_ERROR_UNEXPECTED;
+      memcpy (&tmp6->sin6_addr, &name->prefix.v6, IPV6_ADDR_LEN);
     }
 
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_to_ip_prefix (const hicn_name_t * name, ip_prefix_t * prefix)
+hicn_name_to_ip_prefix (const hicn_name_t *name, ip_prefix_t *prefix)
 {
-  switch (name->type)
-    {
-    case HNT_CONTIGUOUS_V6:
-      memcpy (&prefix->address.v6.buffer, name->buffer, IPV6_ADDR_LEN);
-      prefix->family = AF_INET6;
-      break;
-    case HNT_IOV_V6:
-      memcpy (&prefix->address.v6.buffer, name->iov.buffers[0].iov_base,
-              name->iov.buffers[0].iov_len);
-      prefix->family = AF_INET6;
-      break;
-    case HNT_CONTIGUOUS_V4:
-      memcpy (&prefix->address.v4.buffer, name->buffer, IPV4_ADDR_LEN);
-      prefix->family = AF_INET;
-      break;
-    case HNT_IOV_V4:
-      memcpy (&prefix->address.v4.buffer, name->iov.buffers[0].iov_base,
-              name->iov.buffers[0].iov_len);
-      prefix->family = AF_INET;
-      break;
-    default:
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
+  int family, rc;
+  rc = hicn_name_get_family (name, &family);
+  if (rc)
+    return rc;
 
+  prefix->family = family;
+  prefix->address.v6.as_u64[0] = name->prefix.v6.as_u64[0];
+  prefix->address.v6.as_u64[1] = name->prefix.v6.as_u64[1];
+  prefix->len = 128;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_get_seq_number (const hicn_name_t * name, u32 * seq_number)
+hicn_name_get_seq_number (const hicn_name_t *name, u32 *seq_number)
 {
-  const u8 *sequence_number = NULL;
-
-  switch (name->type)
-    {
-    case HNT_CONTIGUOUS_V6:
-      sequence_number = name->buffer + IPV6_ADDR_LEN;
-      break;
-    case HNT_CONTIGUOUS_V4:
-      sequence_number = name->buffer + IPV4_ADDR_LEN;
-      break;
-    case HNT_IOV_V6:
-    case HNT_IOV_V4:
-      sequence_number = name->iov.buffers[1].iov_base;
-      break;
-    default:
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
-
-  if (sequence_number)
-    {
-      *seq_number = *(u32 *) sequence_number;
-    }
-  else
-    {
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
-
+  *seq_number = name->suffix;
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_name_ntop (const hicn_name_t * src, char *dst, size_t len)
+hicn_name_ntop (const hicn_name_t *src, char *dst, size_t len)
 {
   int offset;
-  const char *rc;
-  void *seg_number = NULL;
-
-  switch (src->type)
-    {
-    case HNT_CONTIGUOUS_V6:
-      rc = inet_ntop (AF_INET6, src->buffer, dst, (socklen_t)len);
-      seg_number = (u8 *) src->buffer + IPV6_ADDR_LEN;
-      break;
-    case HNT_CONTIGUOUS_V4:
-      rc = inet_ntop (AF_INET, src->buffer, dst, (socklen_t)len);
-      seg_number = (u8 *) src->buffer + IPV4_ADDR_LEN;
-      break;
-    case HNT_IOV_V6:
-      rc = inet_ntop (AF_INET6, src->iov.buffers[0].iov_base, dst, (socklen_t)len);
-      seg_number = src->iov.buffers[1].iov_base;
-      break;
-    case HNT_IOV_V4:
-      rc = inet_ntop (AF_INET, src->iov.buffers[0].iov_base, dst, (socklen_t)len);
-      seg_number = src->iov.buffers[1].iov_base;
-      break;
-    default:
-      return HICN_LIB_ERROR_NOT_IMPLEMENTED;
-    }
+  const char *rc = NULL;
+  int v4 = _is_inet4 (src);
+  const u8 *addr = (u8 *) (v4 * (intptr_t) src->prefix.v4.as_u8 +
+			   (1 - v4) * (intptr_t) src->prefix.v6.as_u8);
+  int family = v4 * AF_INET + (1 - v4) * AF_INET6;
+  rc = inet_ntop (family, addr, dst, (socklen_t) len);
 
   if (!rc)
     {
-      goto ERR;
+      return HICN_LIB_ERROR_UNSPECIFIED;
     }
 
-  offset = (int) strlen (dst);
+  offset = (int) strnlen_s (dst, len);
   dst[offset] = '|';
 
-  sprintf (dst + offset + 1, "%lu", (unsigned long) (*(u32 *) seg_number));
+  snprintf (dst + offset + 1, len - offset - 1, "%lu",
+	    (unsigned long) (src->suffix));
 
   return HICN_LIB_ERROR_NONE;
-
-ERR:
-  return HICN_LIB_ERROR_UNSPECIFIED;
 }
 
 int
-hicn_name_pton (const char *src, hicn_name_t * dst)
+hicn_name_pton (const char *src, hicn_name_t *dst)
 {
   return HICN_LIB_ERROR_NOT_IMPLEMENTED;
 }
 
 int
-hicn_name_get_family (const hicn_name_t * name, int *family)
+hicn_name_get_family (const hicn_name_t *name, int *family)
 {
-  switch (name->type)
-    {
-    case HNT_CONTIGUOUS_V6:
-    case HNT_IOV_V6:
-      *family = AF_INET6;
-      break;
-    case HNT_CONTIGUOUS_V4:
-    case HNT_IOV_V4:
-      *family = AF_INET;
-      break;
-    default:
-      return HICN_LIB_ERROR_UNEXPECTED;
-    }
+  assert (!_is_unspec (name));
+  int v4 = _is_inet4 (name);
+  *family = v4 * AF_INET + (1 - v4) * AF_INET6;
 
   return HICN_LIB_ERROR_NONE;
 }
 
 int
-hicn_prefix_create_from_ip_prefix (const ip_prefix_t * ip_prefix,
-                                    hicn_prefix_t * prefix)
+hicn_prefix_create_from_ip_prefix (const ip_prefix_t *ip_prefix,
+				   hicn_prefix_t *prefix)
 {
   switch (ip_prefix->family)
     {
     case AF_INET:
-      prefix->name.ip4.as_u32 = ip_prefix->address.v4.as_u32;
+      prefix->name.v4.as_u32 = ip_prefix->address.v4.as_u32;
       break;
     case AF_INET6:
-      prefix->name.ip6.as_u64[0] = ip_prefix->address.v6.as_u64[0];
-      prefix->name.ip6.as_u64[1] = ip_prefix->address.v6.as_u64[1];
+      prefix->name.v6.as_u64[0] = ip_prefix->address.v6.as_u64[0];
+      prefix->name.v6.as_u64[1] = ip_prefix->address.v6.as_u64[1];
       break;
     default:
       return HICN_LIB_ERROR_INVALID_IP_ADDRESS;
@@ -544,9 +232,6 @@ hicn_prefix_create_from_ip_prefix (const ip_prefix_t * ip_prefix,
   return HICN_LIB_ERROR_NONE;
 }
 
-#endif /* ! HICN_VPP_PLUGIN */
-
-
 /*
  * fd.io coding-style-patch-verification: ON
  *