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

[gnunet]

Author: wachs
Date: 2010-07-30 10:42:43 +0200 (Fri, 30 Jul 2010)
New Revision: 12402

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/plugin_transport_https.c
Log:


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2010-07-30 04:53:42 UTC (rev 12401)
+++ gnunet/src/transport/Makefile.am    2010-07-30 08:42:43 UTC (rev 12402)
@@ -276,7 +276,8 @@
  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 = \

Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-07-30 04:53:42 UTC 
(rev 12401)
+++ gnunet/src/transport/plugin_transport_http.c        2010-07-30 08:42:43 UTC 
(rev 12402)
@@ -2499,9 +2499,17 @@
   }
   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 @@
   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;
   }

Modified: gnunet/src/transport/plugin_transport_https.c
===================================================================
--- gnunet/src/transport/plugin_transport_https.c       2010-07-30 04:53:42 UTC 
(rev 12401)
+++ gnunet/src/transport/plugin_transport_https.c       2010-07-30 08:42:43 UTC 
(rev 12402)
@@ -2629,9 +2629,17 @@
   }
   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;
   }