diff options
-rw-r--r-- | src/transport/plugin_transport_http.c | 12 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_peer2.conf | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index a4ebb5087..55a4e4251 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | #define DEBUG_HTTP GNUNET_YES | 43 | #define DEBUG_HTTP GNUNET_YES |
44 | #define DEBUG_CURL GNUNET_NO | 44 | #define DEBUG_CURL GNUNET_NO |
45 | #define DEBUG_CONNECTIONS GNUNET_YES | 45 | #define DEBUG_CONNECTIONS GNUNET_NO |
46 | #define DEBUG_SESSION_SELECTION GNUNET_NO | 46 | #define DEBUG_SESSION_SELECTION GNUNET_NO |
47 | 47 | ||
48 | #define INBOUND GNUNET_NO | 48 | #define INBOUND GNUNET_NO |
@@ -2383,7 +2383,7 @@ libgnunet_plugin_transport_http_init (void *cls) | |||
2383 | MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL, | 2383 | MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL, |
2384 | MHD_OPTION_END); | 2384 | MHD_OPTION_END); |
2385 | } | 2385 | } |
2386 | if ((plugin->http_server_daemon_v4 == NULL) && (plugin->http_server_daemon_v6 == NULL) && (port != 0)) | 2386 | if ((plugin->http_server_daemon_v4 == NULL) && (port != 0)) |
2387 | { | 2387 | { |
2388 | plugin->http_server_daemon_v4 = MHD_start_daemon ( | 2388 | plugin->http_server_daemon_v4 = MHD_start_daemon ( |
2389 | #if DEBUG_CONNECTIONS | 2389 | #if DEBUG_CONNECTIONS |
@@ -2413,7 +2413,13 @@ libgnunet_plugin_transport_http_init (void *cls) | |||
2413 | 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); | 2413 | 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); |
2414 | #endif | 2414 | #endif |
2415 | } | 2415 | } |
2416 | else if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) | 2416 | else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)) |
2417 | { | ||
2418 | #if DEBUG_HTTP | ||
2419 | 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); | ||
2420 | #endif | ||
2421 | } | ||
2422 | else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 == GNUNET_SCHEDULER_NO_TASK)) | ||
2417 | { | 2423 | { |
2418 | #if DEBUG_HTTP | 2424 | #if DEBUG_HTTP |
2419 | 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); | 2425 | 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); |
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 97ed72071..0a236a3f8 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -32,7 +32,7 @@ MINIMUM-FRIENDS = 0 | |||
32 | 32 | ||
33 | [transport] | 33 | [transport] |
34 | PLUGINS = tcp | 34 | PLUGINS = tcp |
35 | DEBUG = YES | 35 | DEBUG = NO |
36 | ACCEPT_FROM6 = ::1; | 36 | ACCEPT_FROM6 = ::1; |
37 | ACCEPT_FROM = 127.0.0.1; | 37 | ACCEPT_FROM = 127.0.0.1; |
38 | NEIGHBOUR_LIMIT = 50 | 38 | NEIGHBOUR_LIMIT = 50 |