From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 22 Jun 2012 17:14:25 +0000 (+0000)
Subject: -LRN: Mark session as completely disconnected later.
X-Git-Tag: initial-import-from-subversion-38251~12878
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ef32bc72416e56a918919abb1e147c3b7cad04f8;p=oweals%2Fgnunet.git

-LRN: Mark session as completely disconnected later.

  free_neighbour() calls plugin's disconnect() routine, which will invoke
environment session free callback, which will do NOTHING if session is
in "completely disconnected" state (in just "disconnected" state it
will free primary address).

Destroy address in free_address() to make ATS forget the session.

Fixes #2446
---

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 02f4e43d1..918299fef 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -768,6 +768,14 @@ free_address (struct NeighbourAddress *na)
     GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_NO);
     GNUNET_ATS_address_destroyed (GST_ats, na->address, na->session);
   }
+  else
+  {
+    if (NULL != na->address)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "HACK: destroy address\n");
+      GNUNET_ATS_address_destroyed (GST_ats, na->address, na->session);
+    }
+  }
   na->ats_active = GNUNET_NO;
   if (NULL != na->address)
   {
@@ -2497,8 +2505,8 @@ master_task (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 		"Cleaning up connection to `%s' after sending DISCONNECT\n",
 		GNUNET_i2s (&n->id));
-    n->state = S_DISCONNECT_FINISHED;
     free_neighbour (n, GNUNET_NO);
+    n->state = S_DISCONNECT_FINISHED;
     return;
   case S_DISCONNECT_FINISHED:
     /* how did we get here!? */