Removing all the tests for the bluetooth transport plugin.

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

diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index d102880eb2f38d9c8896e9de96c355bab38eb3b3..4d879e1661ec642856e9a12175ed2ea4e20138cc 100644 (file)
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2006,6 +2006,7 @@ static int
 server_start (struct HTTP_Server_Plugin *plugin)
 {
   unsigned int timeout;
+  char *msg;
   GNUNET_assert (NULL != plugin);
 
 #if BUILD_HTTPS
@@ -2029,6 +2030,7 @@ server_start (struct HTTP_Server_Plugin *plugin)
                    "MHD cannot set timeout per connection! Default time out %u sec.\n",
                    timeout);
 #endif
+
   plugin->server_v4 = NULL;
   if (plugin->use_ipv4 == GNUNET_YES)
   {
@@ -2065,7 +2067,17 @@ server_start (struct HTTP_Server_Plugin *plugin)
                                            &server_disconnect_cb, plugin,
                                            MHD_OPTION_EXTERNAL_LOGGER,
                                            server_log, NULL, MHD_OPTION_END);
+    if (plugin->server_v4 == NULL)
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                       "Failed to start %s IPv4 server component on port %u\n",
+                       plugin->name, plugin->port);
+    }
+    else
+       server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
   }
+
+
   plugin->server_v6 = NULL;
   if (plugin->use_ipv6 == GNUNET_YES)
   {
@@ -2102,29 +2114,34 @@ server_start (struct HTTP_Server_Plugin *plugin)
                                            &server_disconnect_cb, plugin,
                                            MHD_OPTION_EXTERNAL_LOGGER,
                                            server_log, NULL, MHD_OPTION_END);
-
-  }
-
-  if ((plugin->use_ipv4 == GNUNET_YES) && (plugin->server_v4 == NULL))
-  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                     "Failed to start %s IPv4 server component on port %u\n",
-                     plugin->name, plugin->port);
-    return GNUNET_SYSERR;
+    if (plugin->server_v6 == NULL)
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                       "Failed to start %s IPv6 server component on port %u\n",
+                       plugin->name, plugin->port);
+    }
+    else
+       server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
   }
-  server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
 
-  if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->server_v6 == NULL))
+       msg = "No";
+  if ((plugin->server_v6 == NULL) && (plugin->server_v4 == NULL))
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                     "Failed to start %s IPv6 server component on port %u\n",
-                     plugin->name, plugin->port);
+                     "%s %s server component started on port %u\n",
+                     msg, plugin->name, plugin->port);
+    sleep (10);
     return GNUNET_SYSERR;
   }
-  server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
+  else if ((plugin->server_v6 != NULL) && (plugin->server_v4 != NULL))
+       msg = "IPv4 and IPv6";
+  else if (plugin->server_v6 != NULL)
+       msg = "IPv6";
+  else if (plugin->server_v4 != NULL)
+       msg = "IPv4";
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "%s server component started on port %u\n", plugin->name,
-                   plugin->port);
+                   "%s %s server component started on port %u\n",
+                   msg, plugin->name, plugin->port);
   return GNUNET_OK;
 }
 
@@ -3124,7 +3141,6 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
       LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
       return NULL;
   }
-
   return api;
 }