link with gnutls

Makefile.am

@@ -15,6 +15,7 @@ cellwired_LDADD = \
     $(top_srcdir)/lib/logger/liblogger.la \
     $(top_srcdir)/lib/message/s1ap/libmessages1ap.la
 
+
 AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
     -I$(top_srcdir)/lib/logger \

configure.ac

@@ -237,6 +237,7 @@ AC_CHECK_LIB([pthread], [pthread_mutex_init], [LIBS="${LIBS} -lpthread"])
 AC_CHECK_LIB([sctp], [sctp_sendmsg], [LIBS="${LIBS} -lsctp"])
 AC_CHECK_LIB([fdcore], [fd_core_initialize], [LIBS="${LIBS} -lfdcore"])
 AC_CHECK_LIB([fdproto], [fd_libproto_init], [LIBS="${LIBS} -lfdproto"])
+AC_CHECK_LIB([gnutls], [gnutls_global_init], [LIBS="${LIBS} -lgnutls"])
 
 #####################
 #### Conclusion. ####

src/s6a_path.c

@@ -1,21 +1,96 @@
 #define TRACE_MODULE _s6a_path
 
 #include "core_debug.h"
+#include "core_lib.h"
 
 #include "freeDiameter/freeDiameter-host.h"
 #include "freeDiameter/libfdcore.h"
 
 #include "s6a_path.h"
 
+static void s6a_gnutls_log_func(int level, const char *str)
+{
+    d_trace(level, "gnutls[%d]: %s", level, str);
+}
+
+static void s6a_fd_logger(int printlevel, const char *format, va_list ap)
+{
+    char buffer[HUGE_STRING_LEN];
+    int  ret = 0;
+
+    ret = vsnprintf(buffer, HUGE_STRING_LEN, format, ap);
+    if (ret < 0 || ret > HUGE_STRING_LEN)
+    {
+        d_error("vsnprintf() failed");
+        return;
+    }
+
+    switch(printlevel) 
+    {
+	    case FD_LOG_ANNOYING: 
+            d_trace(10, "freeDiameter[%d]: %s\n", printlevel, buffer);
+            break;  
+	    case FD_LOG_DEBUG:
+            d_trace(1, "freeDiameter[%d]: %s\n", printlevel, buffer);
+            break;  
+	    case FD_LOG_NOTICE:
+            d_info("%s", buffer);
+            break;
+	    case FD_LOG_ERROR:
+            d_error("%s", buffer);
+            break;
+	    case FD_LOG_FATAL:
+            {
+                char *except = "Initiating freeDiameter shutdown sequence";
+                if (strncmp(buffer, except, strlen(except)) == 0)
+                    d_info("%s", buffer);
+                else
+                    d_fatal("%s", buffer);
+            }
+            break;
+	    default:
+            d_warn("%s", buffer);
+            break;
+    }
+}
+
 status_t s6a_open()
 {
     int ret;
-    ret = fd_core_initialize ();
+
+    d_trace_level(&_s6a_path, 100);
+
+    gnutls_global_set_log_function(s6a_gnutls_log_func);
+    gnutls_global_set_log_level(TRACE_MODULE);
+
+    ret = fd_log_handler_register(s6a_fd_logger);
+    if (ret != 0) 
+    {
+        d_error("fd_log_handler_register() failed");
+        return CORE_ERROR;
+    } 
+
+    ret = fd_core_initialize();
     if (ret != 0) 
     {
         d_error("fd_core_initialize() failed");
-        return ret;
+        return CORE_ERROR;
     } 
+
+    ret = fd_core_start();
+    if (ret != 0) 
+    {
+        d_error("fd_core_start() failed");
+        return CORE_ERROR;
+    } 
+
+    ret = fd_core_waitstartcomplete();
+    if (ret != 0) 
+    {
+        d_error("fd_core_waitstartcomplete() failed");
+        return CORE_ERROR;
+    } 
+
     return CORE_OK;
 }
 
@@ -28,5 +103,11 @@ status_t s6a_close()
         d_error("fd_core_shutdown() failed");
     }
 
+    ret = fd_core_wait_shutdown_complete();
+    if (ret != 0) 
+    {
+        d_error("fd_core_wait_shutdown_complete() failed");
+    }
+
     return CORE_OK;
 }