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 702f1e0a14c6022ca2879381296a392963993e5a..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;
 }
 
@@ -613,6 +615,7 @@ process_interfaces (void *cls,
           return GNUNET_OK;
         }
       t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress));
+      GNUNET_assert(t6 != NULL);
       if (plugin->bind6_address != NULL)
       {
          if (0 == memcmp(&plugin->bind6_address->sin6_addr, &bnd_cmp6, sizeof (struct in6_addr)))
@@ -637,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
@@ -685,8 +695,9 @@ static void mhd_write_mst_cb (void *cls,
 {
 
   struct Session *ps  = cls;
-  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(ps != NULL);
+
+  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(pc != NULL);
 #if DEBUG_HTTP
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -797,8 +808,8 @@ mdh_access_cb (void *cls,
 
   int res = GNUNET_NO;
   int send_error_to_client;
-  void * addr;
-  size_t addr_len;
+  void * addr = NULL;
+  size_t addr_len = 0 ;
 
   GNUNET_assert(cls !=NULL);
   send_error_to_client = GNUNET_NO;
@@ -881,6 +892,9 @@ mdh_access_cb (void *cls,
       addr_len = sizeof(struct IPv6HttpAddress);
     }
 
+    GNUNET_assert (addr != NULL);
+    GNUNET_assert (addr_len != 0);
+
     ps = NULL;
     /* only inbound sessions here */
 
@@ -1289,7 +1303,7 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos);
 #endif
     /* Calling transmit continuation  */
-    if (( NULL != ps->pending_msgs_tail) && (NULL != ps->pending_msgs_tail->transmit_cont))
+    if (NULL != ps->pending_msgs_tail->transmit_cont)
       msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK);
     remove_http_message(ps, msg);
   }
@@ -2410,26 +2424,26 @@ libgnunet_plugin_transport_http_init (void *cls)
   if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
                                                                   "transport-http", "BINDTO6")))
   {
-         GNUNET_break (GNUNET_OK ==
-                                       GNUNET_CONFIGURATION_get_value_string (env->cfg,
+         if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg,
                                                                                                                   "transport-http",
                                                                                                                   "BINDTO6",
-                                                                                                                  &plugin->bind_hostname));
-
-         plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6));
-         plugin->bind6_address->sin6_family = AF_INET6;
-         plugin->bind6_address->sin6_port = htons (port);
-
-      if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+                                                                                                                  &plugin->bind_hostname))
          {
-                 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                                                  "http",
-                                                  _("Misconfigured address to bind to in configuration!\n"),
-                                                  "transport-http");
-                 GNUNET_free(plugin->bind6_address);
-                 GNUNET_free(plugin->bind_hostname);
-                 plugin->bind_hostname = NULL;
-                 plugin->bind6_address = NULL;
+                 plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6));
+                 plugin->bind6_address->sin6_family = AF_INET6;
+                 plugin->bind6_address->sin6_port = htons (port);
+
+                 if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+                 {
+                         GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                                                          "http",
+                                                          _("Misconfigured address to bind to in configuration!\n"),
+                                                          "transport-http");
+                         GNUNET_free(plugin->bind6_address);
+                         GNUNET_free(plugin->bind_hostname);
+                         plugin->bind_hostname = NULL;
+                         plugin->bind6_address = NULL;
+                 }
          }
   }
 
@@ -2441,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,
@@ -2454,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,
@@ -2472,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)
@@ -2500,7 +2516,7 @@ libgnunet_plugin_transport_http_init (void *cls)
   }
   else
   {
-       char * tmp;
+       char * tmp = NULL;
        if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES))
                GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled");
        if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES))