transport service hello reduction, klocwork fixes

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

diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c
index 1d90c77f1846fb8f09cf1c467f0fef4cac2c91cd..ff87f3c948dc7f68fb9aa959027c50911958a43c 100644 (file)
--- a/src/transport/plugin_transport_https.c
+++ b/src/transport/plugin_transport_https.c
@@ -43,6 +43,7 @@
 
 #define DEBUG_HTTPS GNUNET_NO
 #define VERBOSE GNUNET_NO
+#define DEBUG_MHD GNUNET_YES
 #define DEBUG_CURL GNUNET_NO
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
@@ -370,8 +371,10 @@ struct Plugin
 
   /* The private key MHD uses as an \0 terminated string */
   char * key;
-  
+
   char * crypto_init;
+
+  void * mhd_log;
 };
 
 
@@ -426,13 +429,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;
 }
 
@@ -647,6 +650,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
@@ -808,7 +818,7 @@ mdh_access_cb (void *cls,
 
   int res = GNUNET_NO;
   int send_error_to_client;
-  void * addr;
+  void * addr = NULL;
   size_t addr_len = 0;
 
   GNUNET_assert(cls !=NULL);
@@ -1301,12 +1311,12 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
 
   if ( msg->pos == msg->size)
   {
-#if DEBUG_CONNECTIONS
+#if DEBUG_HTTPS
     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->transmit_cont)
-      msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK);
+    if (NULL != msg->transmit_cont)
+      msg->transmit_cont (msg->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK);
     remove_http_message(ps, msg);
   }
   return bytes_sent;
@@ -2284,6 +2294,7 @@ load_certificate( const char * file )
   if (GNUNET_SYSERR == GNUNET_DISK_file_read(gn_file, text, fstat.st_size))
   {
          GNUNET_free(text);
+         GNUNET_DISK_file_close(gn_file);
          return NULL;
   }
   text[fstat.st_size] = '\0';
@@ -2357,6 +2368,8 @@ libgnunet_plugin_transport_https_done (void *cls)
   GNUNET_free_non_null (plugin->bind6_address);
   GNUNET_free_non_null (plugin->bind_hostname);
   GNUNET_free_non_null (plugin->crypto_init);
+  GNUNET_free_non_null (plugin->cert);
+  GNUNET_free_non_null (plugin->key);
   GNUNET_free (plugin);
   GNUNET_free (api);
 #if DEBUG_HTTPS
@@ -2378,8 +2391,8 @@ libgnunet_plugin_transport_https_init (void *cls)
   struct GNUNET_TIME_Relative gn_timeout;
   long long unsigned int port;
 
-  char * key_file;
-  char * cert_file;
+  char * key_file = NULL;
+  char * cert_file = NULL;
 
   GNUNET_assert(cls !=NULL);
 #if DEBUG_HTTPS
@@ -2462,7 +2475,7 @@ libgnunet_plugin_transport_https_init (void *cls)
                  plugin->bind4_address = NULL;
          }
   }
-  
+
     /* Get crypto init string from config */
   if (GNUNET_CONFIGURATION_have_value (env->cfg,
                                                                           "transport-https", "CRYPTO_INIT"))
@@ -2477,20 +2490,6 @@ libgnunet_plugin_transport_https_init (void *cls)
          GNUNET_asprintf(&plugin->crypto_init,"NORMAL");
   }
 
-  /* Get private key file from config */
-  if (GNUNET_CONFIGURATION_have_value (env->cfg,
-                                                                          "transport-https", "CERT_FILE"))
-  {
-         GNUNET_CONFIGURATION_get_value_string (env->cfg,
-                                                                                        "transport-https",
-                                                                                    "CERT_FILE",
-                                                                                    &cert_file);
-  }
-  else
-  {
-         GNUNET_asprintf(&cert_file,"https.cert");
-  }
-
   /* Get private key file from config */
   if (GNUNET_CONFIGURATION_have_value (env->cfg,
                                                                           "transport-https", "KEY_FILE"))
@@ -2500,24 +2499,19 @@ libgnunet_plugin_transport_https_init (void *cls)
                                                                                           "KEY_FILE",
                                                                                           &key_file);
   }
-  else
-  {
+  if (key_file==NULL)
          GNUNET_asprintf(&key_file,"https.key");
-  }
 
   /* Get private key file from config */
-  if (GNUNET_CONFIGURATION_have_value (env->cfg,
-                                                                          "transport-https", "CERT_FILE"))
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,"transport-https", "CERT_FILE"))
   {
          GNUNET_CONFIGURATION_get_value_string (env->cfg,
                                                                                         "transport-https",
                                                                                     "CERT_FILE",
                                                                                     &cert_file);
   }
-  else
-  {
+  if (cert_file==NULL)
          GNUNET_asprintf(&cert_file,"https.cert");
-  }
 
   /* Should plugin use ipv6? */
   if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
@@ -2568,6 +2562,7 @@ libgnunet_plugin_transport_https_init (void *cls)
                                                   "transport-https");
                  GNUNET_free (key_file);
                  GNUNET_free (cert_file);
+
                  libgnunet_plugin_transport_https_done(api);
                  GNUNET_free (cmd);
                  return NULL;
@@ -2596,7 +2591,7 @@ libgnunet_plugin_transport_https_init (void *cls)
 
 
   GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n", key_file, cert_file);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n");
 
   GNUNET_assert ((port > 0) && (port <= 65535));
   plugin->port_inbound = port;
@@ -2606,7 +2601,7 @@ libgnunet_plugin_transport_https_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 | MHD_USE_SSL,
@@ -2626,12 +2621,13 @@ libgnunet_plugin_transport_https_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 | MHD_USE_SSL,
@@ -2651,6 +2647,7 @@ libgnunet_plugin_transport_https_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)