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>

3 files changed, 334 insertions, 276 deletions

diff --git a/lib/src/util/ip_address.c b/lib/src/util/ip_address.c
index 49916547d..412baddcf 100644
--- a/lib/src/util/ip_address.c
+++ b/lib/src/util/ip_address.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:
@@ -20,44 +20,51 @@
 
 #include <hicn/util/ip_address.h>
 #include <hicn/util/log.h>
+#include <hicn/util/sstrncpy.h>
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #ifdef __ANDROID__
-#define SWAP(x) bswap_32(x)
+#define SWAP(x) bswap_32 (x)
 #else
-#define SWAP(x) __bswap_constant_32(x)
+#define SWAP(x) __bswap_constant_32 (x)
 #endif
 #else
 #define SWAP(x) x
 #endif
 
-
 /* No htonl() with const */
 const ip_address_t IPV4_LOOPBACK = {
-    .v4.as_inaddr.s_addr = SWAP(INADDR_LOOPBACK),
+  .v4.as_inaddr.s_addr = SWAP (INADDR_LOOPBACK),
 };
 
-const ip_address_t IPV6_LOOPBACK ={
-    .v6.as_in6addr = IN6ADDR_LOOPBACK_INIT,
+const ip_address_t IPV6_LOOPBACK = {
+  .v6.as_in6addr = IN6ADDR_LOOPBACK_INIT,
 };
 
-const ip_address_t IPV4_ANY =  {
-    .v4.as_inaddr.s_addr = INADDR_ANY,
+const ip_address_t IPV4_ANY = {
+  .v4.as_inaddr.s_addr = INADDR_ANY,
 };
 
 const ip_address_t IPV6_ANY = {
-    .v6.as_in6addr = IN6ADDR_ANY_INIT,
+  .v6.as_in6addr = IN6ADDR_ANY_INIT,
 };
 
-const ip_address_t IP_ADDRESS_EMPTY = {
-    .v6.as_u64 = { 0 },
+const ip4_address_t IP4_ADDRESS_EMPTY = {
+  .as_u32 = 0,
+};
+
+const ip6_address_t IP6_ADDRESS_EMPTY = {
+  .as_u64 = { 0, 0 },
 };
 
+const ip_address_t IP_ADDRESS_EMPTY = {
+  .v6.as_u64 = { 0, 0 },
+};
 
 /* IP address */
 
 int
-ip_address_get_family (const char * ip_address)
+ip_address_get_family (const char *ip_address)
 {
   struct addrinfo hint, *res = NULL;
   int rc;
@@ -81,24 +88,26 @@ int
 ip_address_len (int family)
 {
   return (family == AF_INET6) ? IPV6_ADDR_LEN :
-    (family == AF_INET) ? IPV4_ADDR_LEN : 0;
+	 (family == AF_INET)  ? IPV4_ADDR_LEN :
+				      0;
 }
 
 int
-ip_address_ntop (const ip_address_t * ip_address, char *dst, const size_t len,
-        int family)
+ip_address_ntop (const ip_address_t *ip_address, char *dst, const size_t len,
+		 int family)
 {
-  const char * s;
-  switch(family) {
+  const char *s;
+  switch (family)
+    {
     case AF_INET:
-      s = inet_ntop (AF_INET, ip_address->v4.buffer, dst, (socklen_t)len);
+      s = inet_ntop (AF_INET, ip_address->v4.buffer, dst, (socklen_t) len);
       break;
     case AF_INET6:
-      s = inet_ntop (AF_INET6, ip_address->v6.buffer, dst, (socklen_t)len);
+      s = inet_ntop (AF_INET6, ip_address->v6.buffer, dst, (socklen_t) len);
       break;
     default:
       return -1;
-  }
+    }
   return (s ? 1 : -1);
 }
 
@@ -106,14 +115,15 @@ ip_address_ntop (const ip_address_t * ip_address, char *dst, const size_t len,
  * Parse ip addresses in presentation format
  */
 int
-ip_address_pton (const char *ip_address_str, ip_address_t * ip_address)
+ip_address_pton (const char *ip_address_str, ip_address_t *ip_address)
 {
   int pton_fd;
   int family;
 
   family = ip_address_get_family (ip_address_str);
 
-  switch (family) {
+  switch (family)
+    {
     case AF_INET:
       ip_address->pad[0] = 0;
       ip_address->pad[1] = 0;
@@ -136,32 +146,34 @@ ip_address_pton (const char *ip_address_str, ip_address_t * ip_address)
 }
 
 int
-ip_address_snprintf(char * s, size_t size, const ip_address_t * ip_address, int family)
+ip_address_snprintf (char *s, size_t size, const ip_address_t *ip_address,
+		     int family)
 {
 
-    const char * rc;
-    switch(family) {
-        case AF_INET:
-            if (size < INET_ADDRSTRLEN)
-                return -1;
-            rc = inet_ntop (AF_INET, ip_address->v4.buffer, s, INET_ADDRSTRLEN);
-            break;
-        case AF_INET6:
-            if (size < INET6_ADDRSTRLEN)
-                return -1;
-            rc = inet_ntop (AF_INET6, ip_address->v6.buffer, s, INET6_ADDRSTRLEN);
-            break;
-        default:
-            return -1;
+  const char *rc;
+  switch (family)
+    {
+    case AF_INET:
+      if (size < INET_ADDRSTRLEN)
+	return -1;
+      rc = inet_ntop (AF_INET, ip_address->v4.buffer, s, INET_ADDRSTRLEN);
+      break;
+    case AF_INET6:
+      if (size < INET6_ADDRSTRLEN)
+	return -1;
+      rc = inet_ntop (AF_INET6, ip_address->v6.buffer, s, INET6_ADDRSTRLEN);
+      break;
+    default:
+      return -1;
     }
-    if (!rc)
-        return -1;
-    return (int)strlen(s);
+  if (!rc)
+    return -1;
+  return (int) strnlen_s (s, MAXSZ_IP_ADDRESS);
 }
 
 int
-ip_address_to_sockaddr(const ip_address_t * ip_address,
-        struct sockaddr *sa, int family)
+ip_address_to_sockaddr (const ip_address_t *ip_address, struct sockaddr *sa,
+			int family)
 {
   struct sockaddr_in6 *tmp6 = (struct sockaddr_in6 *) sa;
   struct sockaddr_in *tmp4 = (struct sockaddr_in *) sa;
@@ -187,33 +199,30 @@ ip_address_to_sockaddr(const ip_address_t * ip_address,
 }
 
 int
-ip_address_cmp(const ip_address_t * ip1, const ip_address_t * ip2, int family)
+ip_address_cmp (const ip_address_t *ip1, const ip_address_t *ip2, int family)
 {
-    switch(family) {
-        case AF_INET:
-            return memcmp(&ip1->v4, &ip2->v4, sizeof(ip1->v4));
-            break;
-        case AF_INET6:
-            return memcmp(&ip1->v6, &ip2->v6, sizeof(ip1->v6));
-            break;
-        default:
-            return memcmp(ip1, ip2, sizeof(ip_address_t));
+  switch (family)
+    {
+    case AF_INET:
+      return memcmp (ip1->v4.buffer, ip2->v4.buffer, sizeof (ip1->v4));
+    case AF_INET6:
+    default:
+      return memcmp (ip1->v6.buffer, ip2->v6.buffer, sizeof (ip1->v6));
     }
 }
 
 int
-ip_address_empty(const ip_address_t * ip)
+ip_address_empty (const ip_address_t *ip)
 {
-    return (memcmp(ip, &IP_ADDRESS_EMPTY, sizeof(IP_ADDRESS_EMPTY)) == 0);
+  return (memcmp (ip->v6.buffer, &IP_ADDRESS_EMPTY.v6.buffer,
+		  sizeof (IP_ADDRESS_EMPTY)) == 0);
 }
 
-
-
 /* Prefix */
 
 /* Parse IP Prefixes in presentation format (in bits, separated by a slash) */
 int
-ip_prefix_pton (const char *ip_address_str, ip_prefix_t * ip_prefix)
+ip_prefix_pton (const char *ip_address_str, ip_prefix_t *ip_prefix)
 {
   int pton_fd;
   char *p;
@@ -221,29 +230,32 @@ ip_prefix_pton (const char *ip_address_str, ip_prefix_t * ip_prefix)
   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 = (u8)strtoul (p + 1, &eptr, 10);
-    *p = 0;
-  }
+  if (!p)
+    {
+      ip_prefix->len = ~0; // until we get the ip address family
+    }
+  else
+    {
+      ip_prefix->len = (u8) 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 == (u8)~0)
-          ip_prefix->len = IPV6_ADDR_LEN_BITS;
+      if (ip_prefix->len == (u8) ~0)
+	ip_prefix->len = IPV6_ADDR_LEN_BITS;
       if (ip_prefix->len > IPV6_ADDR_LEN_BITS)
-    goto ERR;
+	goto ERR;
       pton_fd = inet_pton (AF_INET6, addr, &ip_prefix->address.v6.buffer);
       break;
     case AF_INET:
-      if (ip_prefix->len == (u8)~0)
-          ip_prefix->len = IPV4_ADDR_LEN_BITS;
+      if (ip_prefix->len == (u8) ~0)
+	ip_prefix->len = IPV4_ADDR_LEN_BITS;
       if (ip_prefix->len > IPV4_ADDR_LEN_BITS)
-    goto ERR;
+	goto ERR;
       pton_fd = inet_pton (AF_INET, addr, &ip_prefix->address.v4.buffer);
       break;
     default:
@@ -253,9 +265,9 @@ ip_prefix_pton (const char *ip_address_str, ip_prefix_t * ip_prefix)
   //   0 = not in presentation format
   // < 0 = other error (use perror)
   if (pton_fd <= 0)
-      goto ERR;
+    goto ERR;
 
-  free(addr);
+  free (addr);
   return 1;
 ERR:
   free (addr);
@@ -263,129 +275,143 @@ ERR:
 }
 
 int
-ip_prefix_ntop_short(const ip_prefix_t * ip_prefix, char *dst, size_t size)
+ip_prefix_ntop_short (const ip_prefix_t *ip_prefix, char *dst, size_t size)
 {
   char ip_s[MAXSZ_IP_ADDRESS];
-  const char * s;
-  switch(ip_prefix->family) {
+  const char *s;
+  switch (ip_prefix->family)
+    {
     case AF_INET:
-      s = inet_ntop (AF_INET, ip_prefix->address.v4.buffer, ip_s, MAXSZ_IP_ADDRESS);
+      s = inet_ntop (AF_INET, ip_prefix->address.v4.buffer, ip_s,
+		     MAXSZ_IP_ADDRESS);
       break;
     case AF_INET6:
-      s = inet_ntop (AF_INET6, ip_prefix->address.v6.buffer, ip_s, MAXSZ_IP_ADDRESS);
+      s = inet_ntop (AF_INET6, ip_prefix->address.v6.buffer, ip_s,
+		     MAXSZ_IP_ADDRESS);
       break;
     default:
       return -1;
-  }
+    }
   if (!s)
-      return -1;
-  int rc = snprintf(dst, size, "%s", ip_s);
+    return -1;
+  int rc = snprintf (dst, size, "%s", ip_s);
   if (rc >= size)
-      return (int)size;
+    return (int) size;
   return rc;
 }
 
 int
-ip_prefix_ntop(const ip_prefix_t * ip_prefix, char *dst, size_t size)
+ip_prefix_ntop (const ip_prefix_t *ip_prefix, char *dst, size_t size)
 {
   char ip_s[MAXSZ_IP_ADDRESS];
-  const char * s;
-  switch(ip_prefix->family) {
+  const char *s;
+  switch (ip_prefix->family)
+    {
     case AF_INET:
-      s = inet_ntop (AF_INET, ip_prefix->address.v4.buffer, ip_s, MAXSZ_IP_ADDRESS);
+      s = inet_ntop (AF_INET, ip_prefix->address.v4.buffer, ip_s,
+		     MAXSZ_IP_ADDRESS);
       break;
     case AF_INET6:
-      s = inet_ntop (AF_INET6, ip_prefix->address.v6.buffer, ip_s, MAXSZ_IP_ADDRESS);
+      s = inet_ntop (AF_INET6, ip_prefix->address.v6.buffer, ip_s,
+		     MAXSZ_IP_ADDRESS);
       break;
     default:
       return -1;
-  }
+    }
   if (!s)
-      return -1;
-  int rc = snprintf(dst, size, "%s/%d", ip_s, ip_prefix->len);
+    return -1;
+  int rc = snprintf (dst, size, "%s/%d", ip_s, ip_prefix->len);
   if (rc >= size)
-      return (int)size;
+    return (int) size;
   return rc;
 }
 
 int
-ip_prefix_len (const ip_prefix_t * prefix)
+ip_prefix_snprintf (char *s, size_t size, const ip_prefix_t *prefix)
+{
+  return ip_prefix_ntop (prefix, s, size);
+}
+
+int
+ip_prefix_len (const ip_prefix_t *prefix)
 {
-    return prefix->len; // ip_address_len(&prefix->address, prefix->family);
+  return prefix->len; // ip_address_len(&prefix->address, prefix->family);
 }
 
 const u8 *
-ip_address_get_buffer(const ip_address_t * ip_address, int family)
+ip_address_get_buffer (const ip_address_t *ip_address, int family)
 {
-  switch(family) {
+  switch (family)
+    {
     case AF_INET:
       return ip_address->v4.buffer;
     case AF_INET6:
       return ip_address->v6.buffer;
     default:
       return NULL;
-  }
+    }
 }
 
 bool
-ip_prefix_empty (const ip_prefix_t * prefix)
+ip_prefix_empty (const ip_prefix_t *prefix)
 {
   return prefix->len == 0;
 }
 
 int
-ip_prefix_to_sockaddr(const ip_prefix_t * prefix,
-        struct sockaddr *sa)
+ip_prefix_to_sockaddr (const ip_prefix_t *prefix, struct sockaddr *sa)
 {
-    // XXX assert len == ip_address_len
-    return ip_address_to_sockaddr(&prefix->address, sa, prefix->family);
+  // XXX assert len == ip_address_len
+  return ip_address_to_sockaddr (&prefix->address, sa, prefix->family);
 }
 
 int
-ip_prefix_cmp(const ip_prefix_t * prefix1, const ip_prefix_t * prefix2)
+ip_prefix_cmp (const ip_prefix_t *prefix1, const ip_prefix_t *prefix2)
 {
-    if (prefix1->family < prefix2->family)
-        return -1;
-    else if (prefix1->family > prefix2->family)
-        return 1;
+  if (prefix1->family < prefix2->family)
+    return -1;
+  else if (prefix1->family > prefix2->family)
+    return 1;
 
-    if (prefix1->len < prefix2->len)
-        return -1;
-    else if (prefix1->len > prefix2->len)
-        return 1;
+  if (prefix1->len < prefix2->len)
+    return -1;
+  else if (prefix1->len > prefix2->len)
+    return 1;
 
-    return ip_address_cmp(&prefix1->address, &prefix2->address, prefix1->family);
+  return ip_address_cmp (&prefix1->address, &prefix2->address,
+			 prefix1->family);
 }
 
 /* URL */
 
 #define MAXSZ_PROTO_ 8 /* inetX:// */
-#define MAXSZ_PROTO MAXSZ_PROTO_ + NULLTERM
+#define MAXSZ_PROTO  MAXSZ_PROTO_ + NULLTERM
 
 #define MAXSZ_URL4_ MAXSZ_PROTO_ + MAXSZ_IP4_ADDRESS_ + MAXSZ_PORT_
 #define MAXSZ_URL6_ MAXSZ_PROTO_ + MAXSZ_IP6_ADDRESS_ + MAXSZ_PORT_
-#define MAXSZ_URL_ MAXSZ_URL6_
-#define MAXSZ_URL4 MAXSZ_URL4_ + NULLTERM
-#define MAXSZ_URL6 MAXSZ_URL6_ + NULLTERM
-#define MAXSZ_URL MAXSZ_URL_ + NULLTERM
+#define MAXSZ_URL_  MAXSZ_URL6_
+#define MAXSZ_URL4  MAXSZ_URL4_ + NULLTERM
+#define MAXSZ_URL6  MAXSZ_URL6_ + NULLTERM
+#define MAXSZ_URL   MAXSZ_URL_ + NULLTERM
 
 int
-url_snprintf(char * s, size_t size, int family,
-        const ip_address_t * ip_address, u16 port)
+url_snprintf (char *s, size_t size, int family, const ip_address_t *ip_address,
+	      u16 port)
 {
-    char ip_address_s[MAXSZ_IP_ADDRESS];
-    int rc;
+  char ip_address_s[MAXSZ_IP_ADDRESS];
+  int rc;
 
-    /* Other address are currently not supported */
-    if (!IS_VALID_FAMILY(family))
-        return -1;
+  /* Other address are currently not supported */
+  if (!IS_VALID_FAMILY (family))
+    return -1;
 
-    rc = ip_address_snprintf(ip_address_s, MAXSZ_IP_ADDRESS, ip_address, family);
-    if (rc >= MAXSZ_IP_ADDRESS)
-        WARN("[url_snprintf] Unexpected ip_address truncation");
-    if (rc < 0)
-        return rc;
+  rc =
+    ip_address_snprintf (ip_address_s, MAXSZ_IP_ADDRESS, ip_address, family);
+  if (rc >= MAXSZ_IP_ADDRESS)
+    WARN ("[url_snprintf] Unexpected ip_address truncation");
+  if (rc < 0)
+    return rc;
 
-    return snprintf(s, size, "inet%c://%s:%d", (family == AF_INET) ? '4' : '6',
-            ip_address_s, port);
+  return snprintf (s, size, "inet%c://%s:%d", (family == AF_INET) ? '4' : '6',
+		   ip_address_s, port);
 }
diff --git a/lib/src/util/log.c b/lib/src/util/log.c
index c1fc999ad..975762603 100644
--- a/lib/src/util/log.c
+++ b/lib/src/util/log.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:
@@ -18,6 +18,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <strings.h>
 
 #ifdef __ANDROID__
 #include <android/log.h>
@@ -25,154 +26,177 @@
 
 log_conf_t log_conf = DEFAULT_LOG_CONF;
 
-#define FMT_DATETIME "%02d-%02d-%04d %02d:%02d:%02d"
-#define FMT_DATETIME_LEN 20
-#define snprintf_nowarn(...) (snprintf(__VA_ARGS__) < 0 ? abort() : (void)0)
-
+#define FMT_DATETIME	     "%02d-%02d-%04d %02d:%02d:%02d"
+#define FMT_DATETIME_LEN     20
+#define snprintf_nowarn(...) (snprintf (__VA_ARGS__) < 0 ? abort () : (void) 0)
 
 static char ts[FMT_DATETIME_LEN];
 
-static char *timestamp(void)
+static char *
+timestamp (void)
 {
-	time_t tv;
-	struct tm *tm;
+  time_t tv;
+  struct tm *tm;
 
-	time(&tv);
-	tm = localtime(&tv);
+  time (&tv);
+  tm = localtime (&tv);
 
-        snprintf_nowarn(ts, FMT_DATETIME_LEN, FMT_DATETIME, tm->tm_mday,
-                tm->tm_mon + 1, tm->tm_year + 1900, tm->tm_hour, tm->tm_min,
-                tm->tm_sec);
-	return ts;
+  snprintf_nowarn (ts, FMT_DATETIME_LEN, FMT_DATETIME, tm->tm_mday,
+		   tm->tm_mon + 1, tm->tm_year + 1900, tm->tm_hour, tm->tm_min,
+		   tm->tm_sec);
+  return ts;
 }
 
-void _log_va(int level, const char *fmt, va_list ap)
-{  
+void
+_log_va (int level, const char *fmt, va_list ap)
+{
 
 #if 0
 	if (!conf.log_system)
 		return;
 #endif
 
-	char *prefix;
+  char *prefix;
 
 #ifdef __ANDROID__
-	int prio = -1;
-	if (level > log_conf.log_level)
-		return;
-
-	switch (level) {
-		case LOG_FATAL:
-			prio = ANDROID_LOG_FATAL;
-			prefix = "FATAL: ";
-			break;
-		case LOG_ERROR:
-			prio = ANDROID_LOG_ERROR;
-			prefix = "ERROR: ";
-			break;
-		case LOG_WARN:
-			prio = ANDROID_LOG_WARN;
-			prefix = "WARNING: ";
-			break;
-		case LOG_INFO:
-			prio = ANDROID_LOG_INFO;
-			prefix = "";
-			break;
-		case LOG_DEBUG:
-			prio  = ANDROID_LOG_DEBUG;
-			prefix = "DEBUG: ";
-			break;
-		case LOG_TRACE:
-			prio = ANDROID_LOG_DEBUG;
-			prefix = "TRACE: ";
-			break;
-		default:
-			prio = ANDROID_LOG_INFO;
-			prefix = "";
-			break;
-	}
-
-	if (log_conf.log_file) {
-		FILE *f = log_conf.log_file;
-		fprintf(f, "%s %s", timestamp(), prefix);
-		vfprintf(f, fmt, ap);
-		fprintf(f, "\n");
-	} else {
-		__android_log_vprint(ANDROID_LOG_INFO, "HICN FACEMGR", fmt, ap);
-	}
+  int prio = -1;
+  if (level > log_conf.log_level)
+    return;
+
+  switch (level)
+    {
+    case LOG_FATAL:
+      prio = ANDROID_LOG_FATAL;
+      prefix = "FATAL: ";
+      break;
+    case LOG_ERROR:
+      prio = ANDROID_LOG_ERROR;
+      prefix = "ERROR: ";
+      break;
+    case LOG_WARN:
+      prio = ANDROID_LOG_WARN;
+      prefix = "WARNING: ";
+      break;
+    case LOG_INFO:
+      prio = ANDROID_LOG_INFO;
+      prefix = "";
+      break;
+    case LOG_DEBUG:
+      prio = ANDROID_LOG_DEBUG;
+      prefix = "DEBUG: ";
+      break;
+    case LOG_TRACE:
+      prio = ANDROID_LOG_DEBUG;
+      prefix = "TRACE: ";
+      break;
+    default:
+      prio = ANDROID_LOG_INFO;
+      prefix = "";
+      break;
+    }
+
+  if (log_conf.log_file)
+    {
+      FILE *f = log_conf.log_file;
+      fprintf (f, "%s %s", timestamp (), prefix);
+      vfprintf (f, fmt, ap);
+      fprintf (f, "\n");
+    }
+  else
+    {
+      __android_log_vprint (ANDROID_LOG_INFO, "HICN FACEMGR", fmt, ap);
+    }
 
 #else
 
-	if (level > log_conf.log_level)
-		return;
-
-	switch (level) {
-		case LOG_FATAL:
-			prefix = "FATAL: ";
-			break;
-		case LOG_ERROR:
-			prefix = "ERROR: ";
-			break;
-		case LOG_WARN:
-			prefix = "WARNING: ";
-			break;
-		case LOG_INFO:
-			prefix = "";
-			break;
-		case LOG_DEBUG:
-			prefix = "DEBUG: ";
-			break;
-		case LOG_TRACE:
-			prefix = "TRACE: ";
-			break;
-		default:
-			prefix = "";
-			break;
-	}
-	FILE *f = log_conf.log_file ? log_conf.log_file : stdout;
-	fprintf(f, "%s %s", timestamp(), prefix);
-	vfprintf(f, fmt, ap);
-	fprintf(f, "\n");
+  if (level > log_conf.log_level)
+    return;
+
+  switch (level)
+    {
+    case LOG_FATAL:
+      prefix = "FATAL: ";
+      break;
+    case LOG_ERROR:
+      prefix = "ERROR: ";
+      break;
+    case LOG_WARN:
+      prefix = "WARNING: ";
+      break;
+    case LOG_INFO:
+      prefix = "";
+      break;
+    case LOG_DEBUG:
+      prefix = "DEBUG: ";
+      break;
+    case LOG_TRACE:
+      prefix = "TRACE: ";
+      break;
+    default:
+      prefix = "";
+      break;
+    }
+  FILE *f = log_conf.log_file ? log_conf.log_file : stdout;
+  fprintf (f, "%s %s", timestamp (), prefix);
+  vfprintf (f, fmt, ap);
+  fprintf (f, "\n");
 #ifdef DEBUG
-	fflush(f);
+  fflush (f);
 #endif
 #endif
 }
 
-void _log(int level, const char *fmt, ...)
+void
+_log (int level, const char *fmt, ...)
 {
-	va_list ap;
+  va_list ap;
 
-	va_start(ap, fmt);
-	_log_va(level, fmt, ap);
-	va_end(ap);
+  va_start (ap, fmt);
+  _log_va (level, fmt, ap);
+  va_end (ap);
 }
 
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 
-void print_trace(void)
+void
+print_trace (void)
 {
-	void *array[32];
-	size_t size;
+  void *array[32];
+  size_t size;
 
-	size = backtrace(array, 32);
-	fflush(conf.log_file);
-	backtrace_symbols_fd(array, size, fileno(conf.log_file));
+  size = backtrace (array, 32);
+  fflush (conf.log_file);
+  backtrace_symbols_fd (array, size, fileno (conf.log_file));
 }
 #endif
 
-void fatal(char *fmt, ...)
+void
+fatal (char *fmt, ...)
 {
-	va_list ap;
+  va_list ap;
 
-	va_start(ap, fmt);
-	_log_va(LOG_FATAL, fmt, ap);
-	va_end(ap);
+  va_start (ap, fmt);
+  _log_va (LOG_FATAL, fmt, ap);
+  va_end (ap);
 
 #ifdef HAVE_BACKTRACE
-	print_trace();
+  print_trace ();
 #endif
 
-	exit(200);
+  exit (200);
 }
+
+const char *loglevel_str[] = { "fatal", "error", "warn",
+			       "info",	"debug", "trace" };
+
+int
+loglevel_from_str (const char *loglevel)
+{
+  for (int i = 0; i <= LOG_TRACE; i++)
+    {
+      if (strcasecmp (loglevel, loglevel_str[i]) == 0)
+	return i;
+    }
+  return -1;
+}
\ No newline at end of file
diff --git a/lib/src/util/windows/dlfcn.c b/lib/src/util/windows/dlfcn.c
index c8173cdb0..5606074a0 100644
--- a/lib/src/util/windows/dlfcn.c
+++ b/lib/src/util/windows/dlfcn.c
@@ -1,4 +1,4 @@
-/* dlfcn.c */ 
+/* dlfcn.c */
 
 #include <inttypes.h>
 #include <stdio.h>
@@ -6,60 +6,68 @@
 #include <string.h>
 #include <windows.h>
 
-static struct {
-    long lasterror;
-    const char *err_rutin;
-} var = {
-    0,
-    NULL
-};
+static struct
+{
+  long lasterror;
+  const char *err_rutin;
+} var = { 0, NULL };
 
-void *dlopen (const char *filename, int flags)
+void *
+dlopen (const char *filename, int flags)
 {
-    HINSTANCE hInst;
+  HINSTANCE hInst;
 
-    hInst= LoadLibrary (filename);
-    if (hInst==NULL) {
-        var.lasterror = GetLastError ();
-        var.err_rutin = "dlopen";
+  hInst = LoadLibrary (filename);
+  if (hInst == NULL)
+    {
+      var.lasterror = GetLastError ();
+      var.err_rutin = "dlopen";
     }
-    return hInst;
+  return hInst;
 }
 
-int dlclose (void *handle)
+int
+dlclose (void *handle)
 {
-    BOOL ok;
-    int rc= 0;
+  BOOL ok;
+  int rc = 0;
 
-    ok= FreeLibrary ((HINSTANCE)handle);
-    if (! ok) {
-        var.lasterror = GetLastError ();
-        var.err_rutin = "dlclose";
-        rc= -1;
+  ok = FreeLibrary ((HINSTANCE) handle);
+  if (!ok)
+    {
+      var.lasterror = GetLastError ();
+      var.err_rutin = "dlclose";
+      rc = -1;
     }
-    return rc;
+  return rc;
 }
 
-void *dlsym (void *handle, const char *name)
+void *
+dlsym (void *handle, const char *name)
 {
-    FARPROC fp;
+  FARPROC fp;
 
-    fp= GetProcAddress ((HINSTANCE)handle, name);
-    if (!fp) {
-        var.lasterror = GetLastError ();
-        var.err_rutin = "dlsym";
+  fp = GetProcAddress ((HINSTANCE) handle, name);
+  if (!fp)
+    {
+      var.lasterror = GetLastError ();
+      var.err_rutin = "dlsym";
     }
-    return (void *)(intptr_t)fp;
+  return (void *) (intptr_t) fp;
 }
 
-const char *dlerror (void)
+const char *
+dlerror (void)
 {
-static char errstr [88];
+  static char errstr[88];
 
-    if (var.lasterror) {
-        sprintf (errstr, "%s error #%ld", var.err_rutin, var.lasterror);
-        return errstr;
-    } else {
-        return NULL;
+  if (var.lasterror)
+    {
+      snprintf (errstr, 88, "%s error #%ld", var.err_rutin, var.lasterror);
+      return errstr;
+    }
+  else
+    {
+      return NULL;
     }
 }
\ No newline at end of file