aboutsummaryrefslogtreecommitdiffstats
path: root/hicn-light
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-05-13 14:44:51 +0000
committerGerrit Code Review <gerrit@fd.io>2019-05-13 14:44:51 +0000
commit8a4273ffe83b46bc018da58135427d40012282b8 (patch)
tree6b56b41dde64a8841ba7a741e8fa4c4b2fe56f2e /hicn-light
parentbab3d0943eeaf8a042971cb3b80ce839c0767c51 (diff)
parent0a0e51426506985ae1e7cf8c581d109fdad7a725 (diff)
Merge "[HICN-194] support for android environment"
Diffstat (limited to 'hicn-light')
-rw-r--r--hicn-light/CMakeLists.txt2
-rw-r--r--hicn-light/src/hicn/api/api.c5
-rw-r--r--hicn-light/src/hicn/api/ip_address.h7
3 files changed, 14 insertions, 0 deletions
diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt
index c9f90de6a..70ca8ed15 100644
--- a/hicn-light/CMakeLists.txt
+++ b/hicn-light/CMakeLists.txt
@@ -70,6 +70,8 @@ include( Packaging )
find_package(Threads REQUIRED)
+find_package(OpenSSL REQUIRED)
+
set(HICN_LIGHT_LINK_LIBRARIES
hicn-light
${HICN_LIBRARIES}
diff --git a/hicn-light/src/hicn/api/api.c b/hicn-light/src/hicn/api/api.c
index 9b3882379..e139734f5 100644
--- a/hicn-light/src/hicn/api/api.c
+++ b/hicn-light/src/hicn/api/api.c
@@ -27,6 +27,11 @@
#include <stdio.h> // XXX debug
+#ifndef bzero
+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
+#endif
+
+
#include <hicn/api/api.h>
#include <hicn/api/commands.h>
#include <hicn/api/ip_address.h>
diff --git a/hicn-light/src/hicn/api/ip_address.h b/hicn-light/src/hicn/api/ip_address.h
index b58981d85..f44fb1bc3 100644
--- a/hicn-light/src/hicn/api/ip_address.h
+++ b/hicn-light/src/hicn/api/ip_address.h
@@ -27,6 +27,9 @@
#include <machine/endian.h>
#else
#include <endian.h>
+#ifdef __ANDROID__
+#include <byteswap.h>
+#endif
#endif
#include <errno.h>
#include <netdb.h> // struct addrinfo
@@ -82,7 +85,11 @@ typedef union {
/* 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