(no commit message)

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 9f7942f8c2300ff8aa9ae8e936cbe59f6b21e076..082bf1c27c6fc2479765dcfcaa88fb79b613c1ed 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -276,7 +276,8 @@ test_transport_api_reliability_https_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la    
+ $(top_builddir)/src/util/libgnunetutil.la
+     
 endif
 
 EXTRA_DIST = \

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 9893cd27cc3e42d2866c81419cd1872cb050c4e8..abeabd3a793224366c00daa4cf4690507939d1c6 100644 (file)
--- 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)
   }
   else
   {
-#if DEBUG_HTTP
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n");
-#endif
+       char * tmp;
+       if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES))
+               GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled");
+       if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES))
+               GNUNET_asprintf(&tmp,"with IPv4 enabled");
+       if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO))
+               GNUNET_asprintf(&tmp,"with IPv6 enabled");
+       if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO))
+               GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled");
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTP Server with %s could not be started on port %u! https plugin failed!\n",tmp, port);
+       GNUNET_free(tmp);
     libgnunet_plugin_transport_http_done (api);
     return NULL;
   }
@@ -2513,9 +2521,9 @@ libgnunet_plugin_transport_http_init (void *cls)
   if ( NULL == plugin->multi_handle )
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                                  "http",
+                                  "https",
                                   _("Could not initialize curl multi handle, failed to start http plugin!\n"),
-                                  "transport-http");
+                                  "transport-https");
     libgnunet_plugin_transport_http_done (api);
     return NULL;
   }

diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c
index 7017b41b3ac686d86fbbab9c39375521a06cac4d..880d0901761fb065ff80169c70f36b43aeaf1229 100644 (file)
--- 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)
   }
   else
   {
-#if DEBUG_HTTP
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n");
-#endif
+       char * tmp;
+       if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES))
+               GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled");
+       if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES))
+               GNUNET_asprintf(&tmp,"with IPv4 enabled");
+       if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO))
+               GNUNET_asprintf(&tmp,"with IPv6 enabled");
+       if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO))
+               GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled");
+       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTPS Server with %s could not be started on port %u! https plugin failed!\n",tmp, port);
+       GNUNET_free(tmp);
     libgnunet_plugin_transport_https_done (api);
     return NULL;
   }