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

[gnunet]

Author: wachs
Date: 2010-07-12 11:20:17 +0200 (Mon, 12 Jul 2010)
New Revision: 12207

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-07-12 09:10:12 UTC 
(rev 12206)
+++ gnunet/src/transport/plugin_transport_http.c        2010-07-12 09:20:17 UTC 
(rev 12207)
@@ -1715,7 +1715,6 @@
 
     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 @@
         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 @@
         return GNUNET_SYSERR;
       }
     }
+
   return GNUNET_OK;
 }
 
@@ -2037,6 +2037,19 @@
 
   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 @@
     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,

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2010-07-12 09:10:12 UTC 
(rev 12206)
+++ gnunet/src/transport/test_plugin_transport_http.c   2010-07-12 09:20:17 UTC 
(rev 12207)
@@ -848,7 +848,7 @@
   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);