transport service hello reduction, klocwork fixes

[oweals/gnunet.git] / src / transport / plugin_transport_http.c

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 64ef8849bd7531066cacd0567d5c8f69464bef5d..952078865020fc62d8e5248513d8702753894763 100644 (file)
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -42,6 +42,7 @@
 
 #define DEBUG_HTTP GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
+#define DEBUG_MHD GNUNET_YES
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
 
@@ -363,6 +364,7 @@ struct Plugin
   char * bind_hostname;
   int use_ipv6;
   int use_ipv4;
+  void * mhd_log;
 };
 
 
@@ -417,13 +419,13 @@ static char * create_url(void * cls, const void * addr, size_t addrlen, size_t i
 {
   struct Plugin *plugin = cls;
   char *url = NULL;
+  char *addr_str = (char *) http_plugin_address_to_string(NULL, addr, addrlen);
 
   GNUNET_assert ((addr!=NULL) && (addrlen != 0));
   GNUNET_asprintf(&url,
-                  "%s://%s/%s;%u", PROTOCOL_PREFIX,
-                  http_plugin_address_to_string(NULL, addr, addrlen),
+                  "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str,
                   (char *) (&plugin->my_ascii_hash_ident),id);
-
+  GNUNET_free_non_null(addr_str);
   return url;
 }
 
@@ -638,6 +640,13 @@ process_interfaces (void *cls,
   return GNUNET_OK;
 }
 
+void mhd_logger (void * arg, const char * fmt, va_list ap)
+{
+       char text[1024];
+       vsnprintf(text, 1024, fmt, ap);
+       va_end(ap);
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"MHD: %s \n", text);
+}
 
 /**
  * Callback called by MHD when a connection is terminated
@@ -2446,7 +2455,7 @@ libgnunet_plugin_transport_http_init (void *cls)
   {
        struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
     plugin->http_server_daemon_v6 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
                                                                   MHD_USE_DEBUG |
 #endif
                                                                   MHD_USE_IPv6,
@@ -2459,12 +2468,13 @@ libgnunet_plugin_transport_http_init (void *cls)
                                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
                                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
                                        MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
+                                       MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
                                        MHD_OPTION_END);
   }
   if ((plugin->http_server_daemon_v4 == NULL) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0))
   {
   plugin->http_server_daemon_v4 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
                                                                   MHD_USE_DEBUG |
 #endif
                                                                   MHD_NO_FLAG,
@@ -2477,6 +2487,7 @@ libgnunet_plugin_transport_http_init (void *cls)
                                        MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
                                        MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
                                        MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
+                                       MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
                                        MHD_OPTION_END);
   }
   if (plugin->http_server_daemon_v4 != NULL)