splitting 'struct GNUNET_CRYPTO_EccPublicKey' into one struct for signing and another...

[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 bcb8e53ae70f68fcbf05110854863d59f7600a4f..4d879e1661ec642856e9a12175ed2ea4e20138cc 100644 (file)
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2031,22 +2031,22 @@ server_start (struct HTTP_Server_Plugin *plugin)
                    timeout);
 #endif
 
-  plugin->server_v6 = NULL;
-  if (plugin->use_ipv6 == GNUNET_YES)
+  plugin->server_v4 = NULL;
+  if (plugin->use_ipv4 == GNUNET_YES)
   {
-    plugin->server_v6 = MHD_start_daemon (
+    plugin->server_v4 = MHD_start_daemon (
 #if VERBOSE_SERVER
                                            MHD_USE_DEBUG |
 #endif
 #if BUILD_HTTPS
                                            MHD_USE_SSL |
 #endif
-                                           MHD_USE_IPv6, plugin->port,
+                                           MHD_NO_FLAG, plugin->port,
                                            &server_accept_cb, plugin,
                                            &server_access_cb, plugin,
                                            MHD_OPTION_SOCK_ADDR,
-                                           (struct sockaddr_in6 *)
-                                           plugin->server_addr_v6,
+                                           (struct sockaddr_in *)
+                                           plugin->server_addr_v4,
                                            MHD_OPTION_CONNECTION_LIMIT,
                                            (unsigned int)
                                            plugin->max_connections,
@@ -2067,32 +2067,33 @@ server_start (struct HTTP_Server_Plugin *plugin)
                                            &server_disconnect_cb, plugin,
                                            MHD_OPTION_EXTERNAL_LOGGER,
                                            server_log, NULL, MHD_OPTION_END);
-    if (plugin->server_v6 == NULL)
+    if (plugin->server_v4 == NULL)
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                       "Failed to start %s IPv6 server component on port %u\n",
+                       "Failed to start %s IPv4 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);
   }
 
-  plugin->server_v4 = NULL;
-  if (plugin->use_ipv4 == GNUNET_YES)
+
+  plugin->server_v6 = NULL;
+  if (plugin->use_ipv6 == GNUNET_YES)
   {
-    plugin->server_v4 = MHD_start_daemon (
+    plugin->server_v6 = MHD_start_daemon (
 #if VERBOSE_SERVER
                                            MHD_USE_DEBUG |
 #endif
 #if BUILD_HTTPS
                                            MHD_USE_SSL |
 #endif
-                                           MHD_NO_FLAG, plugin->port,
+                                           MHD_USE_IPv6, plugin->port,
                                            &server_accept_cb, plugin,
                                            &server_access_cb, plugin,
                                            MHD_OPTION_SOCK_ADDR,
-                                           (struct sockaddr_in *)
-                                           plugin->server_addr_v4,
+                                           (struct sockaddr_in6 *)
+                                           plugin->server_addr_v6,
                                            MHD_OPTION_CONNECTION_LIMIT,
                                            (unsigned int)
                                            plugin->max_connections,
@@ -2113,25 +2114,26 @@ 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)
+    if (plugin->server_v6 == NULL)
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                       "Failed to start %s IPv4 server component on port %u\n",
+                       "Failed to start %s IPv6 server component on port %u\n",
                        plugin->name, plugin->port);
     }
     else
-       server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
+       server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
   }
 
        msg = "No";
-  if ((plugin->server_v6 == NULL) && (plugin->server_v6 == NULL))
+  if ((plugin->server_v6 == NULL) && (plugin->server_v4 == NULL))
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
                      "%s %s server component started on port %u\n",
                      msg, plugin->name, plugin->port);
+    sleep (10);
     return GNUNET_SYSERR;
   }
-  else if ((plugin->server_v6 != NULL) && (plugin->server_v6 != NULL))
+  else if ((plugin->server_v6 != NULL) && (plugin->server_v4 != NULL))
        msg = "IPv4 and IPv6";
   else if (plugin->server_v6 != NULL)
        msg = "IPv6";
@@ -2140,7 +2142,6 @@ server_start (struct HTTP_Server_Plugin *plugin)
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                    "%s %s server component started on port %u\n",
                    msg, plugin->name, plugin->port);
-
   return GNUNET_OK;
 }