diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-07-30 08:42:43 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-07-30 08:42:43 +0000 |
commit | af9166cc548fe2ceb021987a294f95b6be7f3400 (patch) | |
tree | 25f520f87a3fb030b1b3006eea9dec7ee96a1083 /src | |
parent | fe89565ba923f9ef70b6715196bcbf8b34f5f260 (diff) | |
download | gnunet-af9166cc548fe2ceb021987a294f95b6be7f3400.tar.gz gnunet-af9166cc548fe2ceb021987a294f95b6be7f3400.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/Makefile.am | 3 | ||||
-rw-r--r-- | src/transport/plugin_transport_http.c | 18 | ||||
-rw-r--r-- | src/transport/plugin_transport_https.c | 14 |
3 files changed, 26 insertions, 9 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 9f7942f8c..082bf1c27 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -276,7 +276,8 @@ test_transport_api_reliability_https_SOURCES = \ | |||
276 | test_transport_api_reliability.c | 276 | test_transport_api_reliability.c |
277 | test_transport_api_reliability_https_LDADD = \ | 277 | test_transport_api_reliability_https_LDADD = \ |
278 | $(top_builddir)/src/transport/libgnunettransport.la \ | 278 | $(top_builddir)/src/transport/libgnunettransport.la \ |
279 | $(top_builddir)/src/util/libgnunetutil.la | 279 | $(top_builddir)/src/util/libgnunetutil.la |
280 | |||
280 | endif | 281 | endif |
281 | 282 | ||
282 | EXTRA_DIST = \ | 283 | EXTRA_DIST = \ |
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 9893cd27c..abeabd3a7 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -2499,9 +2499,17 @@ libgnunet_plugin_transport_http_init (void *cls) | |||
2499 | } | 2499 | } |
2500 | else | 2500 | else |
2501 | { | 2501 | { |
2502 | #if DEBUG_HTTP | 2502 | char * tmp; |
2503 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n"); | 2503 | if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES)) |
2504 | #endif | 2504 | GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled"); |
2505 | if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES)) | ||
2506 | GNUNET_asprintf(&tmp,"with IPv4 enabled"); | ||
2507 | if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO)) | ||
2508 | GNUNET_asprintf(&tmp,"with IPv6 enabled"); | ||
2509 | if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO)) | ||
2510 | GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled"); | ||
2511 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTP Server with %s could not be started on port %u! https plugin failed!\n",tmp, port); | ||
2512 | GNUNET_free(tmp); | ||
2505 | libgnunet_plugin_transport_http_done (api); | 2513 | libgnunet_plugin_transport_http_done (api); |
2506 | return NULL; | 2514 | return NULL; |
2507 | } | 2515 | } |
@@ -2513,9 +2521,9 @@ libgnunet_plugin_transport_http_init (void *cls) | |||
2513 | if ( NULL == plugin->multi_handle ) | 2521 | if ( NULL == plugin->multi_handle ) |
2514 | { | 2522 | { |
2515 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, | 2523 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, |
2516 | "http", | 2524 | "https", |
2517 | _("Could not initialize curl multi handle, failed to start http plugin!\n"), | 2525 | _("Could not initialize curl multi handle, failed to start http plugin!\n"), |
2518 | "transport-http"); | 2526 | "transport-https"); |
2519 | libgnunet_plugin_transport_http_done (api); | 2527 | libgnunet_plugin_transport_http_done (api); |
2520 | return NULL; | 2528 | return NULL; |
2521 | } | 2529 | } |
diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c index 7017b41b3..880d09017 100644 --- a/src/transport/plugin_transport_https.c +++ b/src/transport/plugin_transport_https.c | |||
@@ -2629,9 +2629,17 @@ libgnunet_plugin_transport_https_init (void *cls) | |||
2629 | } | 2629 | } |
2630 | else | 2630 | else |
2631 | { | 2631 | { |
2632 | #if DEBUG_HTTP | 2632 | char * tmp; |
2633 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n"); | 2633 | if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES)) |
2634 | #endif | 2634 | GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled"); |
2635 | if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES)) | ||
2636 | GNUNET_asprintf(&tmp,"with IPv4 enabled"); | ||
2637 | if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO)) | ||
2638 | GNUNET_asprintf(&tmp,"with IPv6 enabled"); | ||
2639 | if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO)) | ||
2640 | GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled"); | ||
2641 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTPS Server with %s could not be started on port %u! https plugin failed!\n",tmp, port); | ||
2642 | GNUNET_free(tmp); | ||
2635 | libgnunet_plugin_transport_https_done (api); | 2643 | libgnunet_plugin_transport_https_done (api); |
2636 | return NULL; | 2644 | return NULL; |
2637 | } | 2645 | } |