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

[gnunet]

Author: grothoff
Date: 2016-07-24 16:07:52 +0200 (Sun, 24 Jul 2016)
New Revision: 37575

Modified:
   gnunet/src/transport/plugin_transport_http_server.c
Log:
fix http server shutdown sequence

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2016-07-23 22:32:35 UTC 
(rev 37574)
+++ gnunet/src/transport/plugin_transport_http_server.c 2016-07-24 14:07:52 UTC 
(rev 37575)
@@ -774,8 +774,8 @@
  */
 static int
 destroy_session_shutdown_cb (void *cls,
-                    const struct GNUNET_PeerIdentity *peer,
-                    void *value)
+                            const struct GNUNET_PeerIdentity *peer,
+                            void *value)
 {
   struct GNUNET_ATS_Session *s = value;
   struct ServerRequest *sc_send;
@@ -1851,9 +1851,12 @@
       else
       {
         /* delay processing */
-        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-            "Session %p / Connection %p: no inbound bandwidth available! Next 
read was delayed by %s\n",
-            s, sc, GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                   "Session %p / Connection %p: no inbound bandwidth 
available! Next read was delayed by %s\n",
+                   s,
+                   sc,
+                   GNUNET_STRINGS_relative_time_to_string (delay,
+                                                           GNUNET_YES));
         GNUNET_assert(s->server_recv->mhd_conn == mhd_connection);
         MHD_suspend_connection (s->server_recv->mhd_conn);
         if (NULL == s->recv_wakeup_task)
@@ -3170,16 +3173,6 @@
 
   /* Stop to report addresses to transport service */
   server_stop_report_addresses (plugin);
-  if (NULL != plugin->server_v4)
-  {
-    MHD_stop_daemon (plugin->server_v4);
-    plugin->server_v4 = NULL;
-  }
-  if (NULL != plugin->server_v6)
-  {
-    MHD_stop_daemon (plugin->server_v6);
-    plugin->server_v6 = NULL;
-  }
   if (NULL != plugin->server_v4_task)
   {
     GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
@@ -3201,6 +3194,16 @@
                                          plugin);
   GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
   plugin->sessions = NULL;
+  if (NULL != plugin->server_v4)
+  {
+    MHD_stop_daemon (plugin->server_v4);
+    plugin->server_v4 = NULL;
+  }
+  if (NULL != plugin->server_v6)
+  {
+    MHD_stop_daemon (plugin->server_v6);
+    plugin->server_v6 = NULL;
+  }
   /* Clean up */
   GNUNET_free_non_null (plugin->external_hostname);
   GNUNET_free_non_null (plugin->ext_addr);