From 7542b63e25e6b11ced7d53a16bf8a724815a68a3 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 12 Jul 2010 09:20:17 +0000 Subject: --- src/transport/plugin_transport_http.c | 28 +++++++++++++++------------- src/transport/test_plugin_transport_http.c | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index 2ece30433..eae422cc9 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c @@ -1715,7 +1715,6 @@ http_plugin_disconnect (void *cls, if (ps->direction==OUTBOUND) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"connections %X\n", ps, GNUNET_i2s(target)); if (ps->send_endpoint!=NULL) { //curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint); @@ -1855,7 +1854,7 @@ http_plugin_address_suggested (void *cls, return GNUNET_SYSERR; } } - else + if (addrlen == sizeof (struct IPv6HttpAddress)) { v6 = (struct IPv6HttpAddress *) addr; if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) @@ -1868,6 +1867,7 @@ http_plugin_address_suggested (void *cls, return GNUNET_SYSERR; } } + return GNUNET_OK; } @@ -2037,6 +2037,19 @@ libgnunet_plugin_transport_http_done (void *cls) GNUNET_assert(cls !=NULL); + if (plugin->http_server_daemon_v4 != NULL) + { + MHD_stop_daemon (plugin->http_server_daemon_v4); + plugin->http_server_daemon_v4 = NULL; + } + if (plugin->http_server_daemon_v6 != NULL) + { + MHD_stop_daemon (plugin->http_server_daemon_v6); + plugin->http_server_daemon_v6 = NULL; + } + + + if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) { GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4); @@ -2055,17 +2068,6 @@ libgnunet_plugin_transport_http_done (void *cls) plugin->http_server_task_send = GNUNET_SCHEDULER_NO_TASK; } - if (plugin->http_server_daemon_v4 != NULL) - { - MHD_stop_daemon (plugin->http_server_daemon_v4); - plugin->http_server_daemon_v4 = NULL; - } - if (plugin->http_server_daemon_v6 != NULL) - { - MHD_stop_daemon (plugin->http_server_daemon_v6); - plugin->http_server_daemon_v6 = NULL; - } - /* free all peer information */ GNUNET_CONTAINER_multihashmap_iterate (plugin->peers, &remove_peer_context_Iterator, diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c index db67ad226..3fa2d18a9 100644 --- a/src/transport/test_plugin_transport_http.c +++ b/src/transport/test_plugin_transport_http.c @@ -848,7 +848,7 @@ notify_address (void *cls, else { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Unknown address size: ipv6 has %u ipv4 has %u but this has %u"), + _("Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"), sizeof (struct IPv6HttpAddress), sizeof (struct IPv4HttpAddress), addrlen); -- cgit v1.2.3