[HICN-385] fix route removal in hicnctrl, code uniformization in hicn-light control api

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

3 files changed, 6 insertions, 6 deletions

diff --git a/hicn-light/src/hicn/core/name.c b/hicn-light/src/hicn/core/name.c
index f4ea7dbca..7ef3fcc01 100644
--- a/hicn-light/src/hicn/core/name.c
+++ b/hicn-light/src/hicn/core/name.c
@@ -112,15 +112,15 @@ Name *name_CreateFromPacket(const uint8_t *packet, MessagePacketType type) {
   return name;
 }
 
-Name *name_CreateFromAddress(address_type addressType, union commandAddr addr,
+Name *name_CreateFromAddress(address_type addressType, ip_address_t addr,
                              uint8_t len) {
   Name *name = parcMemory_AllocateAndClear(sizeof(Name));
   parcAssertNotNull(name, "parcMemory_AllocateAndClear(%zu) returned NULL",
                     sizeof(Name));
   if (addressType == ADDR_INET) {
-    name->content_name = nameBitvector_CreateFromInAddr(addr.ipv4, len);
+    name->content_name = nameBitvector_CreateFromInAddr(addr.v4.as_u32, len);
   } else if (addressType == ADDR_INET6) {
-    name->content_name = nameBitvector_CreateFromIn6Addr(&addr.ipv6, len);
+    name->content_name = nameBitvector_CreateFromIn6Addr(&addr.v6.as_in6addr, len);
   } else {
     parcTrapNotImplemented("Unkown packet type");
   }
diff --git a/hicn-light/src/hicn/core/name.h b/hicn-light/src/hicn/core/name.h
index f2ae1f64e..29c8439f8 100644
--- a/hicn-light/src/hicn/core/name.h
+++ b/hicn-light/src/hicn/core/name.h
@@ -93,7 +93,7 @@ void name_setLen(Name *name, uint8_t len);
  * Creates a name from a Address
  *
  */
-Name *name_CreateFromAddress(address_type addressType, union commandAddr addr,
+Name *name_CreateFromAddress(address_type addressType, ip_address_t addr,
                              uint8_t len);
 
 #ifdef WITH_POLICY
diff --git a/hicn-light/src/hicn/core/nameBitvector.c b/hicn-light/src/hicn/core/nameBitvector.c
index 9a734359c..ab459b126 100644
--- a/hicn-light/src/hicn/core/nameBitvector.c
+++ b/hicn-light/src/hicn/core/nameBitvector.c
@@ -266,7 +266,7 @@ void nameBitvector_clear(NameBitvector *a, uint8_t start_from){
 int nameBitvector_ToIPAddress(const NameBitvector *name,
                               ip_prefix_t *prefix) {
   if (name->IPversion == IPv4_TYPE) {
-    struct in_addr *addr = (struct in_addr *)(&prefix->address.buffer);
+    struct in_addr *addr = (struct in_addr *)(&prefix->address.v4.buffer);
     prefix->family = AF_INET;
     prefix->len = IPV4_ADDR_LEN_BITS;
 
@@ -283,7 +283,7 @@ int nameBitvector_ToIPAddress(const NameBitvector *name,
     addr->s_addr = (addr->s_addr | addr_1);
 
   } else {
-    struct in6_addr *addr = (struct in6_addr *)(&prefix->address.buffer);
+    struct in6_addr *addr = (struct in6_addr *)(&prefix->address.v6.buffer);
     prefix->family = AF_INET6;
     prefix->len = name->len;  // IPV6_ADDR_LEN_BITS;