[HICN-708] Rebase with master

Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159

3 files changed, 42 insertions, 1 deletions

diff --git a/lib/includes/hicn/util/log.h b/lib/includes/hicn/util/log.h
index 6763d464f..5650a164e 100644
--- a/lib/includes/hicn/util/log.h
+++ b/lib/includes/hicn/util/log.h
@@ -34,7 +34,7 @@ typedef struct {
 } log_conf_t;
 
 #define DEFAULT_LOG_CONF {      \
-    .log_level = LOG_INFO,      \
+    .log_level = LOG_TRACE,      \
     .debug = 0,                 \
     .log_file = NULL,           \
 };
diff --git a/lib/includes/hicn/util/windows/dlfcn.h b/lib/includes/hicn/util/windows/dlfcn.h
new file mode 100644
index 000000000..7775226cd
--- /dev/null
+++ b/lib/includes/hicn/util/windows/dlfcn.h
@@ -0,0 +1,33 @@
+/* dlfcn.h */
+
+#ifndef DLFCN_H
+#define DLFCN_H
+#define RTLD_GLOBAL 0x100 /* do not hide entries in this module */
+#define RTLD_LOCAL  0x000 /* hide entries in this module */
+
+#define RTLD_LAZY   0x000 /* accept unresolved externs */
+#define RTLD_NOW    0x001 /* abort if module has unresolved externs */
+
+/*
+   How to call in Windows:
+
+   void *h = dlopen ("path\\library.dll", flags)
+   void (*fun)() = dlsym (h, "entry")
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+      void *dlopen  (const char *filename, int flag);
+      int   dlclose (void *handle);
+
+      void *dlsym   (void *handle, const char *name);
+
+const char *dlerror (void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
diff --git a/lib/includes/hicn/util/windows/windows_utils.h b/lib/includes/hicn/util/windows/windows_utils.h
index c4662af5e..d24aaadbf 100755
--- a/lib/includes/hicn/util/windows/windows_utils.h
+++ b/lib/includes/hicn/util/windows/windows_utils.h
@@ -17,12 +17,16 @@
 #define WINDOWS_UTILS_H

 #define WIN32_LEAN_AND_MEAN

 #define HAVE_STRUCT_TIMESPEC

+#ifndef NOMINMAX

+#define NOMINMAX

+#endif

 #include <Windows.h>

 #include <stdint.h>

 #include <io.h>

 #include <stdlib.h>

 #include <winsock2.h>

 #include <WS2tcpip.h>

+#include "dlfcn.h"

 

 #ifndef IOVEC

 #define IOVEC

@@ -152,3 +156,7 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp);
   ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8)	\

    | (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24))

 #endif

+

+#ifndef bzero

+#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)

+#endif
\ No newline at end of file