diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-05-04 08:47:51 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-05-04 08:47:51 +0000 |
commit | db9926f66da9571020fba8f1f2fa0014d1b65b0f (patch) | |
tree | 734cb4b6709b64c8678d639e2cbc6b4b6d8c6d46 | |
parent | 3cbee1d6d6d396b45e88f7f0e6f1b5a21e9f2f77 (diff) | |
download | gnunet-db9926f66da9571020fba8f1f2fa0014d1b65b0f.tar.gz gnunet-db9926f66da9571020fba8f1f2fa0014d1b65b0f.zip |
-rw-r--r-- | src/transport/plugin_transport_http.c | 10 | ||||
-rw-r--r-- | src/transport/test_plugin_transport_http.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 52a6ff0dc..08aba3a14 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -346,7 +346,7 @@ libgnunet_plugin_transport_http_init (void *cls) | |||
346 | { | 346 | { |
347 | if ( use_ipv6 == GNUNET_YES) | 347 | if ( use_ipv6 == GNUNET_YES) |
348 | { | 348 | { |
349 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon could not started, http plugin not working\n"); | 349 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD on port %u with IPv6 enabled\n",port); |
350 | http_daemon = MHD_start_daemon (MHD_USE_IPv6, | 350 | http_daemon = MHD_start_daemon (MHD_USE_IPv6, |
351 | port, | 351 | port, |
352 | &acceptPolicyCallback, | 352 | &acceptPolicyCallback, |
@@ -386,13 +386,13 @@ libgnunet_plugin_transport_http_init (void *cls) | |||
386 | 386 | ||
387 | curl_multi = curl_multi_init (); | 387 | curl_multi = curl_multi_init (); |
388 | 388 | ||
389 | if ( (NULL != http_daemon) && (NULL != curl_multi)) | 389 | if ( (NULL == http_daemon) || (NULL == curl_multi)) |
390 | return api; | ||
391 | else | ||
392 | { | 390 | { |
393 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"Initializing http plugin failed\n"); | 391 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Initializing http plugin failed\n"); |
394 | return NULL; | 392 | return NULL; |
395 | } | 393 | } |
394 | else | ||
395 | return api; | ||
396 | } | 396 | } |
397 | 397 | ||
398 | 398 | ||
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c index 76e4f64f6..91ed4327f 100644 --- a/src/transport/test_plugin_transport_http.c +++ b/src/transport/test_plugin_transport_http.c | |||
@@ -231,13 +231,13 @@ run (void *cls, | |||
231 | api = GNUNET_PLUGIN_load (libname, &env); | 231 | api = GNUNET_PLUGIN_load (libname, &env); |
232 | if (api != NULL ) | 232 | if (api != NULL ) |
233 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 233 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
234 | "Loading transport plugin for http `%s' successful\n",libname); | 234 | "Loading http transport plugin `%s' was successful\n",libname); |
235 | 235 | ||
236 | GNUNET_free (libname); | 236 | GNUNET_free (libname); |
237 | if (api == NULL) | 237 | if (api == NULL) |
238 | { | 238 | { |
239 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 239 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
240 | _("Failed to load transport plugin for http\n")); | 240 | _("Failed to load http transport plugin\n")); |
241 | /* FIXME: set some error code for main */ | 241 | /* FIXME: set some error code for main */ |
242 | return; | 242 | return; |
243 | } | 243 | } |