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

[gnunet]

Author: wachs
Date: 2010-07-16 15:28:31 +0200 (Fri, 16 Jul 2010)
New Revision: 12245

Modified:
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/test_transport_api_tcp_peer2.conf
Log:


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-07-16 12:38:13 UTC 
(rev 12244)
+++ gnunet/src/transport/plugin_transport_http.c        2010-07-16 13:28:31 UTC 
(rev 12245)
@@ -42,7 +42,7 @@
 
 #define DEBUG_HTTP GNUNET_YES
 #define DEBUG_CURL GNUNET_NO
-#define DEBUG_CONNECTIONS GNUNET_YES
+#define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
 
 #define INBOUND GNUNET_NO
@@ -2383,7 +2383,7 @@
                                        MHD_OPTION_NOTIFY_COMPLETED, 
&mhd_termination_cb, NULL,
                                        MHD_OPTION_END);
   }
-  if ((plugin->http_server_daemon_v4 == NULL) && 
(plugin->http_server_daemon_v6 == NULL) && (port != 0))
+  if ((plugin->http_server_daemon_v4 == NULL) && (port != 0))
   {
   plugin->http_server_daemon_v4 = MHD_start_daemon (
 #if DEBUG_CONNECTIONS
@@ -2413,9 +2413,15 @@
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 bound to 
%s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : 
"every address",port);
 #endif
   }
-  else if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
+  else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && 
(plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK))
   {
 #if DEBUG_HTTP
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv6 bound to %s 
with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every 
address", port);
+#endif
+  }
+  else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && 
(plugin->http_server_task_v4 == GNUNET_SCHEDULER_NO_TASK))
+  {
+#if DEBUG_HTTP
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 and IPv6 bound 
to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : 
"every address", port);
 #endif
   }

Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf      2010-07-16 
12:38:13 UTC (rev 12244)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf      2010-07-16 
13:28:31 UTC (rev 12245)
@@ -32,7 +32,7 @@
 
 [transport]
 PLUGINS = tcp
-DEBUG = YES
+DEBUG = NO
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50