removed malloc from curl_logger
[oweals/gnunet.git] / src / transport / plugin_transport_http.c
index 775b260c73b9a707dce45956fd8c9adf509cb269..6af53332acce02f0fa00ba67a232555718bd102c 100644 (file)
 
 #if BUILD_HTTPS
 #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_done
 #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_https
 #define PROTOCOL_PREFIX "https"
 #else
 #define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_done
 #define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_http
 #define PROTOCOL_PREFIX "http"
 #endif
 
-#define DEBUG_HTTP GNUNET_YES
+#define DEBUG_HTTP GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
 #define DEBUG_MHD GNUNET_NO
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
-
+#define DEBUG_SCHEDULING GNUNET_NO
 #define CURL_TCP_NODELAY GNUNET_YES
 
 #define INBOUND GNUNET_NO
@@ -404,6 +406,7 @@ struct Plugin
    */
   void * mhd_log;
 
+  /* only needed for HTTPS plugin */
 #if BUILD_HTTPS
   /* The certificate MHD uses as an \0 terminated string */
   char * cert;
@@ -447,12 +450,12 @@ static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_
 
 /**
  * Function setting up curl handle and selecting message to send
- * @param cls plugin
+ * @param plugin plugin
  * @param ses session to send data to
  * @param con connection
  * @return bytes sent to peer
  */
-static ssize_t send_check_connections (void *cls, struct Session *ps);
+static int send_check_connections (struct Plugin *plugin, struct Session *ps);
 
 /**
  * Function setting up file descriptors and scheduling task to run
@@ -460,20 +463,19 @@ static ssize_t send_check_connections (void *cls, struct Session *ps);
  * @param ses session to send data to
  * @param
  */
-static int curl_schedule(void *cls );
+static int curl_schedule (struct Plugin *plugin);
 
 
 /**
  * Creates a valid url from passed address and id
- * @param cls plugin as closure
+ * @param plugin plugin
  * @param addr address to create url from
  * @param addrlen address lenth
  * @param id session id
  * @return the created url
  */
-static char * create_url(void * cls, const void * addr, size_t addrlen, size_t id)
+static char * create_url(struct Plugin *plugin, const void * addr, size_t addrlen, size_t id)
 {
-  struct Plugin *plugin = cls;
   char *url = NULL;
   char *addr_str = (char *) http_plugin_address_to_string(NULL, addr, addrlen);
 
@@ -661,12 +663,12 @@ process_interfaces (void *cls,
       {
          if (0 == memcmp(&plugin->bind4_address->sin_addr, &bnd_cmp, sizeof (struct in_addr)))
          {
-                 plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
+                 plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
          }
       }
       else
       {
-         plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
+         plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
       }
       GNUNET_free (t4);
     }
@@ -687,7 +689,7 @@ process_interfaces (void *cls,
                      &((struct sockaddr_in6 *) addr)->sin6_addr,
                      sizeof (struct in6_addr));
              t6->u6_port = htons (plugin->port_inbound);
-             plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
+             plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
          }
       }
       else
@@ -696,7 +698,7 @@ process_interfaces (void *cls,
                   &((struct sockaddr_in6 *) addr)->sin6_addr,
                   sizeof (struct in6_addr));
           t6->u6_port = htons (plugin->port_inbound);
-          plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
+          plugin->env->notify_address(plugin->env->cls,PROTOCOL_PREFIX,t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
       }
       GNUNET_free (t6);
     }
@@ -718,19 +720,14 @@ void mhd_logger (void * arg, const char * fmt, va_list ap)
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"MHD: %s \n", text);
 }
 
-/**
- * Callback called by MHD when a connection is terminated
- * @param cls closure
- * @param connection the terminated connection
- * @httpSessionCache the mhd session reference
- */
+
 static void mhd_termination_cb (void *cls, struct MHD_Connection * connection, void **httpSessionCache)
 {
   struct Session * ps = *httpSessionCache;
   if (ps == NULL)
     return;
   struct HTTP_PeerContext * pc = ps->peercontext;
-
+        
   if (connection==ps->recv_endpoint)
   {
 #if DEBUG_CONNECTIONS
@@ -804,8 +801,7 @@ static void mhd_write_mst_cb (void *cls,
  *
  */
 static int
-mhd_accept_cb (void *cls,
-                      const struct sockaddr *addr, socklen_t addr_len)
+mhd_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len)
 {
 #if 0
   struct Plugin *plugin = cls;
@@ -825,11 +821,13 @@ mhd_accept_cb (void *cls,
  */
 int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max)
 {
-  int bytes_read = 0;
   struct Session * ps = cls;
   struct HTTP_PeerContext * pc;
   struct HTTP_Message * msg;
+  int bytes_read = 0;
+
   GNUNET_assert (ps!=NULL);
+
   pc = ps->peercontext;
   msg = ps->pending_msgs_tail;
   if (ps->send_force_disconnect==GNUNET_YES)
@@ -874,12 +872,12 @@ int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max)
  */
 static int
 mdh_access_cb (void *cls,
-                       struct MHD_Connection *mhd_connection,
-                       const char *url,
-                       const char *method,
-                       const char *version,
-                       const char *upload_data,
-                       size_t * upload_data_size, void **httpSessionCache)
+                          struct MHD_Connection *mhd_connection,
+                          const char *url,
+                          const char *method,
+                          const char *version,
+                          const char *upload_data,
+                          size_t * upload_data_size, void **httpSessionCache)
 {
   struct Plugin *plugin = cls;
   struct MHD_Response *response;
@@ -1112,14 +1110,13 @@ mdh_access_cb (void *cls,
 /**
  * Function that queries MHD's select sets and
  * starts the task waiting for them.
- * @param cls plugin as closure
+ * @param plugin plugin
  * @param daemon_handle the MHD daemon handle
  * @return gnunet task identifier
  */
 static GNUNET_SCHEDULER_TaskIdentifier
-http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle)
+http_server_daemon_prepare (struct Plugin *plugin , struct MHD_Daemon *daemon_handle)
 {
-  struct Plugin *plugin = cls;
   GNUNET_SCHEDULER_TaskIdentifier ret;
   fd_set rs;
   fd_set ws;
@@ -1132,7 +1129,6 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle)
   int haveto;
   struct GNUNET_TIME_Relative tv;
 
-  GNUNET_assert(cls !=NULL);
   ret = GNUNET_SCHEDULER_NO_TASK;
   FD_ZERO(&rs);
   FD_ZERO(&ws);
@@ -1151,7 +1147,7 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle)
   if (haveto == MHD_YES)
     tv.value = (uint64_t) timeout;
   else
-    tv = GNUNET_TIME_UNIT_FOREVER_REL;
+    tv = GNUNET_TIME_UNIT_SECONDS;
   GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max);
   GNUNET_NETWORK_fdset_copy_native (wws, &ws, max);
   GNUNET_NETWORK_fdset_copy_native (wes, &es, max);
@@ -1206,6 +1202,19 @@ static void http_server_daemon_v4_run (void *cls,
 {
   struct Plugin *plugin = cls;
 
+#if DEBUG_SCHEDULING
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_READ_READY\n");      
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) 
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n");  
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_STARTUP\n");        
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n");                 
+#endif              
+      
   GNUNET_assert(cls !=NULL);
   plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK;
 
@@ -1227,6 +1236,19 @@ static void http_server_daemon_v6_run (void *cls,
                              const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct Plugin *plugin = cls;
+  
+#if DEBUG_SCHEDULING  
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_READ_READY\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) 
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP))  
+     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_STARTUP\n");    
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))  
+     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n"); 
+#endif                                            
 
   GNUNET_assert(cls !=NULL);
   plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
@@ -1408,7 +1430,7 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
   if ( msg->pos == msg->size)
   {
 #if DEBUG_CONNECTIONS
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos);
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"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)
@@ -1609,12 +1631,9 @@ static void curl_perform (void *cls,
 
   GNUNET_assert(cls !=NULL);
 
-
-
   plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
-
   do
     {
       running = 0;
@@ -1624,7 +1643,6 @@ static void curl_perform (void *cls,
       handles_last_run = running;
     }
   while (mret == CURLM_CALL_MULTI_PERFORM);
-
   curl_schedule(plugin);
 }
 
@@ -1635,9 +1653,8 @@ static void curl_perform (void *cls,
  * @param cls plugin as closure
  * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
  */
-static int curl_schedule(void *cls)
+static int curl_schedule(struct Plugin *plugin)
 {
-  struct Plugin *plugin = cls;
   fd_set rs;
   fd_set ws;
   fd_set es;
@@ -1647,8 +1664,6 @@ static int curl_schedule(void *cls)
   long to;
   CURLMcode mret;
 
-  GNUNET_assert(cls !=NULL);
-
   /* Cancel previous scheduled task */
   if (plugin->http_curl_task !=  GNUNET_SCHEDULER_NO_TASK)
   {
@@ -1696,23 +1711,48 @@ static int curl_schedule(void *cls)
   return GNUNET_OK;
 }
 
+/**
+ * Function to log curl debug messages with GNUNET_log
+ * @param curl handle
+ * @param type curl_infotype
+ * @param data data
+ * @param size size
+ * @param cls  closure
+ * @return 0
+ */
+int curl_logger (CURL * curl, curl_infotype type , char * data, size_t size , void * cls)
+{
+
+       if (type == CURLINFO_TEXT)
+       {
+               char text[size+2];
+               memcpy(text,data,size);
+               if (text[size-1] == '\n')
+                       text[size] = '\0';
+               else
+               {
+                       text[size] = '\n';
+                       text[size+1] = '\0';
+               }
+               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"CURL: Connection %X - %s", cls, text);
+       }
+       return 0;
+}
+
 /**
  * Function setting up curl handle and selecting message to send
  *
- * @param cls plugin
+ * @param plugin plugin
  * @param ps session
  * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok
  */
-static ssize_t send_check_connections (void *cls, struct Session *ps)
+static int send_check_connections (struct Plugin *plugin, struct Session *ps)
 {
-  struct Plugin *plugin = cls;
   CURLMcode mret;
   struct HTTP_Message * msg;
 
   struct GNUNET_TIME_Relative timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
 
-  GNUNET_assert(cls !=NULL);
-
   if (ps->direction == OUTBOUND)
   {
     /* RECV DIRECTION */
@@ -1727,6 +1767,13 @@ static ssize_t send_check_connections (void *cls, struct Session *ps)
         }
 #if DEBUG_CURL
         curl_easy_setopt(ps->recv_endpoint, CURLOPT_VERBOSE, 1L);
+        curl_easy_setopt(ps->recv_endpoint, CURLOPT_DEBUGFUNCTION , &curl_logger);
+        curl_easy_setopt(ps->recv_endpoint, CURLOPT_DEBUGDATA , ps->recv_endpoint);
+#endif
+#if BUILD_HTTPS
+        curl_easy_setopt (ps->recv_endpoint, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+               curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSL_VERIFYPEER, 0);
+               curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSL_VERIFYHOST, 0);
 #endif
         curl_easy_setopt(ps->recv_endpoint, CURLOPT_URL, ps->url);
         curl_easy_setopt(ps->recv_endpoint, CURLOPT_HEADERFUNCTION, &curl_get_header_cb);
@@ -1818,6 +1865,13 @@ static ssize_t send_check_connections (void *cls, struct Session *ps)
 
 #if DEBUG_CURL
                curl_easy_setopt(ps->send_endpoint, CURLOPT_VERBOSE, 1L);
+        curl_easy_setopt(ps->send_endpoint, CURLOPT_DEBUGFUNCTION , &curl_logger);
+        curl_easy_setopt(ps->send_endpoint, CURLOPT_DEBUGDATA , ps->send_endpoint);
+#endif
+#if BUILD_HTTPS
+        curl_easy_setopt (ps->send_endpoint, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+               curl_easy_setopt(ps->send_endpoint, CURLOPT_SSL_VERIFYPEER, 0);
+               curl_easy_setopt(ps->send_endpoint, CURLOPT_SSL_VERIFYHOST, 0);
 #endif
                curl_easy_setopt(ps->send_endpoint, CURLOPT_URL, ps->url);
                curl_easy_setopt(ps->send_endpoint, CURLOPT_PUT, 1L);
@@ -1879,7 +1933,7 @@ static ssize_t send_check_connections (void *cls, struct Session *ps)
  * @return selected session
  *
  */
-static struct Session * send_select_session (void * cls, struct HTTP_PeerContext *pc, const void * addr, size_t addrlen, int force_address, struct Session * session)
+static struct Session * send_select_session (struct HTTP_PeerContext *pc, const void * addr, size_t addrlen, int force_address, struct Session * session)
 {
        struct Session * tmp = NULL;
        int addr_given = GNUNET_NO;
@@ -2079,58 +2133,56 @@ http_plugin_send (void *cls,
                            GNUNET_NO);
   }
 
-  ps = send_select_session (plugin, pc, addr, addrlen, force_address, session);
+  ps = send_select_session (pc, addr, addrlen, force_address, session);
 
   /* session not existing, but address forced -> creating new session */
   if (ps==NULL)
   {
-    if ((addr!=NULL) && (addrlen!=0))
-    {
+       if ((addr!=NULL) && (addrlen!=0))
+       {
       ps = GNUNET_malloc(sizeof (struct Session));
 #if DEBUG_SESSION_SELECTION
       if (force_address == GNUNET_YES)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection & forced address: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection & forced address: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
       if (force_address != GNUNET_YES)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
 #endif
       if ((addrlen!=0) && (addr!=NULL))
       {
-      ps->addr = GNUNET_malloc(addrlen);
-      memcpy(ps->addr,addr,addrlen);
-      ps->addrlen = addrlen;
+         ps->addr = GNUNET_malloc(addrlen);
+         memcpy(ps->addr,addr,addrlen);
+         ps->addrlen = addrlen;
       }
-      else
-      {
-        ps->addr = NULL;
-        ps->addrlen = 0;
-      }
-      ps->direction=OUTBOUND;
-      ps->recv_connected = GNUNET_NO;
-      ps->recv_force_disconnect = GNUNET_NO;
-      ps->send_connected = GNUNET_NO;
-      ps->send_force_disconnect = GNUNET_NO;
-      ps->pending_msgs_head = NULL;
-      ps->pending_msgs_tail = NULL;
-      ps->peercontext=pc;
-      ps->session_id = pc->session_id_counter;
-      pc->session_id_counter++;
-      ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
-      if (ps->msgtok == NULL)
-        ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps);
-      GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
-/* FIXME */
-
-      GNUNET_STATISTICS_update (plugin->env->stats,
-                           gettext_noop ("# HTTP outbound sessions for peers active"),
-                           1,
-                           GNUNET_NO);
-    }
-    else
-    {
+         else
+         {
+               ps->addr = NULL;
+               ps->addrlen = 0;
+         }
+         ps->direction=OUTBOUND;
+         ps->recv_connected = GNUNET_NO;
+         ps->recv_force_disconnect = GNUNET_NO;
+         ps->send_connected = GNUNET_NO;
+         ps->send_force_disconnect = GNUNET_NO;
+         ps->pending_msgs_head = NULL;
+         ps->pending_msgs_tail = NULL;
+         ps->peercontext=pc;
+         ps->session_id = pc->session_id_counter;
+         pc->session_id_counter++;
+         ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
+         if (ps->msgtok == NULL)
+                       ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps);
+         GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
+         GNUNET_STATISTICS_update (plugin->env->stats,
+                                                               gettext_noop ("# HTTP outbound sessions for peers active"),
+                                                               1,
+                                                               GNUNET_NO);
+       }
+       else
+       {
 #if DEBUG_HTTP
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing session found & and no address given: no way to send this message to peer `%s'!\n", GNUNET_i2s(target));
+               GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing session found & and no address given: no way to send this message to peer `%s'!\n", GNUNET_i2s(target));
 #endif
-      return GNUNET_SYSERR;
+               return GNUNET_SYSERR;
     }
   }
 
@@ -2402,7 +2454,7 @@ http_plugin_address_to_string (void *cls,
  * Exit point from the plugin.
  */
 void *
-libgnunet_plugin_transport_http_done (void *cls)
+LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
 {
   struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
   struct Plugin *plugin = api->cls;
@@ -2432,7 +2484,6 @@ libgnunet_plugin_transport_http_done (void *cls)
     plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
   }
 
-
   /* free all peer information */
   if (plugin->peers!=NULL)
   {
@@ -2576,7 +2627,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                        _("Require valid port number for transport plugin `%s' in configuration!\n"),
                        PROTOCOL_PREFIX);
       GNUNET_free(component_name);
-      libgnunet_plugin_transport_http_done (api);
+      LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
       return NULL;
     }
 
@@ -2593,15 +2644,18 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
          plugin->bind4_address->sin_family = AF_INET;
          plugin->bind4_address->sin_port = htons (port);
 
-         if (inet_pton(AF_INET,plugin->bind_hostname, &plugin->bind4_address->sin_addr)<=0)
+         if (plugin->bind_hostname!=NULL)
          {
-                 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                                                  component_name,
-                                                  _("Misconfigured address to bind to in configuration!\n"));
-                 GNUNET_free(plugin->bind4_address);
-                 GNUNET_free(plugin->bind_hostname);
-                 plugin->bind_hostname = NULL;
-                 plugin->bind4_address = NULL;
+                 if (inet_pton(AF_INET,plugin->bind_hostname, &plugin->bind4_address->sin_addr)<=0)
+                 {
+                         GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                                                          component_name,
+                                                          _("Misconfigured address to bind to in configuration!\n"));
+                         GNUNET_free(plugin->bind4_address);
+                         GNUNET_free(plugin->bind_hostname);
+                         plugin->bind_hostname = NULL;
+                         plugin->bind4_address = NULL;
+                 }
          }
   }
 
@@ -2617,16 +2671,18 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                  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)
+                 if (plugin->bind_hostname!=NULL)
                  {
-                         GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                                                          component_name,
-                                                          _("Misconfigured address to bind to in configuration!\n"));
-                         GNUNET_free(plugin->bind6_address);
-                         GNUNET_free(plugin->bind_hostname);
-                         plugin->bind_hostname = NULL;
-                         plugin->bind6_address = NULL;
+                         if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+                         {
+                                 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                                                                  component_name,
+                                                                  _("Misconfigured address to bind to in configuration!\n"));
+                                 GNUNET_free(plugin->bind6_address);
+                                 GNUNET_free(plugin->bind_hostname);
+                                 plugin->bind_hostname = NULL;
+                                 plugin->bind6_address = NULL;
+                         }
                  }
          }
   }
@@ -2694,7 +2750,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                  GNUNET_free (cert_file);
                  GNUNET_free (component_name);
 
-                 libgnunet_plugin_transport_http_done(api);
+                 LIBGNUNET_PLUGIN_TRANSPORT_DONE(api);
                  GNUNET_free (cmd);
                  return NULL;
          }
@@ -2714,15 +2770,13 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                  GNUNET_free (cert_file);
                  GNUNET_free (component_name);
 
-                 libgnunet_plugin_transport_http_done(api);
+                 LIBGNUNET_PLUGIN_TRANSPORT_DONE(api);
                  return NULL;
          }
   }
-
   GNUNET_free (key_file);
   GNUNET_free (cert_file);
 
-
   GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n");
 #endif
@@ -2824,7 +2878,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTP Server with %s could not be started on port %u! %s plugin failed!\n",tmp, port, PROTOCOL_PREFIX);
        GNUNET_free (tmp);
     GNUNET_free (component_name);
-    libgnunet_plugin_transport_http_done (api);
+    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
     return NULL;
   }
 
@@ -2839,7 +2893,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                                         _("Could not initialize curl multi handle, failed to start %s plugin!\n"),
                                         PROTOCOL_PREFIX);
     GNUNET_free(component_name);
-    libgnunet_plugin_transport_http_done (api);
+    LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
     return NULL;
   }