[HICN-298] Release new hICN app for Android

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

5 files changed, 23 insertions, 14 deletions

diff --git a/hicn-light/src/hicn/core/connection.c b/hicn-light/src/hicn/core/connection.c
index 2f50dbf7f..821da884d 100644
--- a/hicn-light/src/hicn/core/connection.c
+++ b/hicn-light/src/hicn/core/connection.c
@@ -28,7 +28,7 @@
 #include <parc/algol/parc_Memory.h>
 #include <parc/assert/parc_Assert.h>
 #ifdef WITH_POLICY
-#include <hicn/utils/policy.h>
+#include <hicn/policy.h>
 #endif /* WITH_POLICY */
 
 struct connection {
@@ -329,6 +329,14 @@ void connection_SetAdminState(Connection *conn, connection_state_t admin_state)
   ioOperations_SetAdminState(conn->ops, admin_state);
 }
 
+const char * connection_GetInterfaceName(const Connection * conn)
+{
+  parcAssertNotNull(conn, "Parameter conn must be non-null");
+  if (!conn->ops)
+    return NULL;
+  return ioOperations_GetInterfaceName(conn->ops);
+}
+
 #ifdef WITH_POLICY
 
 void connection_AddTag(Connection *conn, policy_tag_t tag)
diff --git a/hicn-light/src/hicn/core/connection.h b/hicn-light/src/hicn/core/connection.h
index c007a1a26..b7b5e3c91 100644
--- a/hicn-light/src/hicn/core/connection.h
+++ b/hicn-light/src/hicn/core/connection.h
@@ -41,7 +41,7 @@ typedef enum {
 #endif /* WITH_MAPME */
 
 #ifdef WITH_POLICY
-#include <hicn/utils/policy.h>
+#include <hicn/policy.h>
 #endif /* WITH_POLICY */
 
 // packet types for probing
@@ -183,6 +183,8 @@ connection_state_t connection_GetAdminState(const Connection *conn);
 
 void connection_SetAdminState(Connection *conn, connection_state_t admin_state);
 
+const char * connection_GetInterfaceName(const Connection * conn);
+
 #ifdef WITH_POLICY
 void connection_AddTag(Connection *conn, policy_tag_t tag);
 void connection_RemoveTag(Connection *conn, policy_tag_t tag);
diff --git a/hicn-light/src/hicn/core/mapMe.c b/hicn-light/src/hicn/core/mapMe.c
index 0f86dfd7e..2b621387b 100644
--- a/hicn-light/src/hicn/core/mapMe.c
+++ b/hicn-light/src/hicn/core/mapMe.c
@@ -207,11 +207,11 @@ static PARCIterator *mapMeTFIB_CreateKeyIterator(const MapMeTFIB *tfib) {
 
 int hicn_prefix_from_name(const Name *name, hicn_prefix_t *prefix) {
   NameBitvector *bv = name_GetContentName(name);
-  ip_address_t ip_address;
-  nameBitvector_ToIPAddress(bv, &ip_address);
+  ip_prefix_t ip_prefix;
+  nameBitvector_ToIPAddress(bv, &ip_prefix);
 
   /* The name length will be equal to ip address' prefix length */
-  return hicn_prefix_create_from_ip_address(&ip_address, prefix);
+  return hicn_prefix_create_from_ip_prefix(&ip_prefix, prefix);
 }
 
 static Message *mapMe_createMessage(const MapMe *mapme, const Name *name,
diff --git a/hicn-light/src/hicn/core/nameBitvector.c b/hicn-light/src/hicn/core/nameBitvector.c
index ad6884d02..9a734359c 100644
--- a/hicn-light/src/hicn/core/nameBitvector.c
+++ b/hicn-light/src/hicn/core/nameBitvector.c
@@ -264,11 +264,11 @@ void nameBitvector_clear(NameBitvector *a, uint8_t start_from){
 }
 
 int nameBitvector_ToIPAddress(const NameBitvector *name,
-                              ip_address_t *ip_address) {
+                              ip_prefix_t *prefix) {
   if (name->IPversion == IPv4_TYPE) {
-    struct in_addr *addr = (struct in_addr *)(&ip_address->buffer);
-    ip_address->family = AF_INET;
-    ip_address->prefix_len = IPV4_ADDR_LEN_BITS;
+    struct in_addr *addr = (struct in_addr *)(&prefix->address.buffer);
+    prefix->family = AF_INET;
+    prefix->len = IPV4_ADDR_LEN_BITS;
 
     uint32_t tmp_addr = name->bits[0] >> 32ULL;
     uint8_t addr_1 = (tmp_addr & 0xff000000) >> 24;
@@ -283,9 +283,9 @@ int nameBitvector_ToIPAddress(const NameBitvector *name,
     addr->s_addr = (addr->s_addr | addr_1);
 
   } else {
-    struct in6_addr *addr = (struct in6_addr *)(&ip_address->buffer);
-    ip_address->family = AF_INET6;
-    ip_address->prefix_len = name->len;  // IPV6_ADDR_LEN_BITS;
+    struct in6_addr *addr = (struct in6_addr *)(&prefix->address.buffer);
+    prefix->family = AF_INET6;
+    prefix->len = name->len;  // IPV6_ADDR_LEN_BITS;
 
     for (int i = 0; i < 8; i++) {
       addr->s6_addr[i] = (uint8_t)((name->bits[0] >> 8 * (7 - i)) & 0xFF);
diff --git a/hicn-light/src/hicn/core/nameBitvector.h b/hicn-light/src/hicn/core/nameBitvector.h
index 44cc45662..19944778c 100644
--- a/hicn-light/src/hicn/core/nameBitvector.h
+++ b/hicn-light/src/hicn/core/nameBitvector.h
@@ -48,8 +48,7 @@ uint32_t nameBitvector_lpm(const NameBitvector *a, const NameBitvector *b);
 
 void nameBitvector_clear(NameBitvector *a, uint8_t start_from);
 
-int nameBitvector_ToIPAddress(const NameBitvector *name,
-                              ip_address_t *ip_address);
+int nameBitvector_ToIPAddress(const NameBitvector *name, ip_prefix_t *prefix);
 void nameBitvector_setLen(NameBitvector *name, uint8_t len);
 
 Address *nameBitvector_ToAddress(const NameBitvector *name);