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

[gnunet]

Author: wachs
Date: 2010-05-04 10:47:51 +0200 (Tue, 04 May 2010)
New Revision: 11173

Modified:
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_http.c
Log:


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-05-04 07:16:28 UTC 
(rev 11172)
+++ gnunet/src/transport/plugin_transport_http.c        2010-05-04 08:47:51 UTC 
(rev 11173)
@@ -346,7 +346,7 @@
     {
       if ( use_ipv6 == GNUNET_YES)
         {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon could not started, 
http plugin not working\n");
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD on port %u with 
IPv6 enabled\n",port);
           http_daemon = MHD_start_daemon (MHD_USE_IPv6,
                                          port,
                                          &acceptPolicyCallback,
@@ -386,13 +386,13 @@
 
   curl_multi = curl_multi_init ();
 
-  if ( (NULL != http_daemon) && (NULL != curl_multi))
-    return api;
-  else
+  if ( (NULL == http_daemon) || (NULL == curl_multi))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Initializing http plugin failed\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Initializing http plugin failed\n");
     return NULL;
   }
+  else
+    return api;
 }
 
 

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2010-05-04 07:16:28 UTC 
(rev 11172)
+++ gnunet/src/transport/test_plugin_transport_http.c   2010-05-04 08:47:51 UTC 
(rev 11173)
@@ -231,13 +231,13 @@
   api = GNUNET_PLUGIN_load (libname, &env);
   if (api != NULL )
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Loading transport plugin for http `%s' successful\n",libname);
+              "Loading http transport plugin `%s' was successful\n",libname);
 
   GNUNET_free (libname);
   if (api == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load transport plugin for http\n"));
+                  _("Failed to load http transport plugin\n"));
       /* FIXME: set some error code for main */
       return;
     }