aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-07-12 09:20:17 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-07-12 09:20:17 +0000
commit7542b63e25e6b11ced7d53a16bf8a724815a68a3 (patch)
tree29cc766747013eef7a8d216403aeb90c856f4f9c
parent582b44420cd908b78342aa01ba96c6f8cc64dccc (diff)
downloadgnunet-7542b63e25e6b11ced7d53a16bf8a724815a68a3.tar.gz
gnunet-7542b63e25e6b11ced7d53a16bf8a724815a68a3.zip
-rw-r--r--src/transport/plugin_transport_http.c28
-rw-r--r--src/transport/test_plugin_transport_http.c2
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,
1715 1715
1716 if (ps->direction==OUTBOUND) 1716 if (ps->direction==OUTBOUND)
1717 { 1717 {
1718 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"connections %X\n", ps, GNUNET_i2s(target));
1719 if (ps->send_endpoint!=NULL) 1718 if (ps->send_endpoint!=NULL)
1720 { 1719 {
1721 //curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint); 1720 //curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
@@ -1855,7 +1854,7 @@ http_plugin_address_suggested (void *cls,
1855 return GNUNET_SYSERR; 1854 return GNUNET_SYSERR;
1856 } 1855 }
1857 } 1856 }
1858 else 1857 if (addrlen == sizeof (struct IPv6HttpAddress))
1859 { 1858 {
1860 v6 = (struct IPv6HttpAddress *) addr; 1859 v6 = (struct IPv6HttpAddress *) addr;
1861 if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) 1860 if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
@@ -1868,6 +1867,7 @@ http_plugin_address_suggested (void *cls,
1868 return GNUNET_SYSERR; 1867 return GNUNET_SYSERR;
1869 } 1868 }
1870 } 1869 }
1870
1871 return GNUNET_OK; 1871 return GNUNET_OK;
1872} 1872}
1873 1873
@@ -2037,6 +2037,19 @@ libgnunet_plugin_transport_http_done (void *cls)
2037 2037
2038 GNUNET_assert(cls !=NULL); 2038 GNUNET_assert(cls !=NULL);
2039 2039
2040 if (plugin->http_server_daemon_v4 != NULL)
2041 {
2042 MHD_stop_daemon (plugin->http_server_daemon_v4);
2043 plugin->http_server_daemon_v4 = NULL;
2044 }
2045 if (plugin->http_server_daemon_v6 != NULL)
2046 {
2047 MHD_stop_daemon (plugin->http_server_daemon_v6);
2048 plugin->http_server_daemon_v6 = NULL;
2049 }
2050
2051
2052
2040 if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) 2053 if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
2041 { 2054 {
2042 GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4); 2055 GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4);
@@ -2055,17 +2068,6 @@ libgnunet_plugin_transport_http_done (void *cls)
2055 plugin->http_server_task_send = GNUNET_SCHEDULER_NO_TASK; 2068 plugin->http_server_task_send = GNUNET_SCHEDULER_NO_TASK;
2056 } 2069 }
2057 2070
2058 if (plugin->http_server_daemon_v4 != NULL)
2059 {
2060 MHD_stop_daemon (plugin->http_server_daemon_v4);
2061 plugin->http_server_daemon_v4 = NULL;
2062 }
2063 if (plugin->http_server_daemon_v6 != NULL)
2064 {
2065 MHD_stop_daemon (plugin->http_server_daemon_v6);
2066 plugin->http_server_daemon_v6 = NULL;
2067 }
2068
2069 /* free all peer information */ 2071 /* free all peer information */
2070 GNUNET_CONTAINER_multihashmap_iterate (plugin->peers, 2072 GNUNET_CONTAINER_multihashmap_iterate (plugin->peers,
2071 &remove_peer_context_Iterator, 2073 &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,
848 else 848 else
849 { 849 {
850 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 850 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
851 _("Unknown address size: ipv6 has %u ipv4 has %u but this has %u"), 851 _("Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"),
852 sizeof (struct IPv6HttpAddress), 852 sizeof (struct IPv6HttpAddress),
853 sizeof (struct IPv4HttpAddress), 853 sizeof (struct IPv4HttpAddress),
854 addrlen); 854 addrlen);