[GNUnet-SVN] r28986 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2013-09-04 16:24:14 +0200 (Wed, 04 Sep 2013)
New Revision: 28986

Modified:
   gnunet/src/transport/plugin_transport_http_server.c
Log:
order of daemons


Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-09-04 12:38:10 UTC 
(rev 28985)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-09-04 14:24:14 UTC 
(rev 28986)
@@ -2031,22 +2031,22 @@
                    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_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,14 +2114,14 @@
                                            &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";