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

[gnunet]

Author: wachs
Date: 2011-12-20 16:48:22 +0100 (Tue, 20 Dec 2011)
New Revision: 18722

Modified:
   gnunet/src/transport/transport_api.c
Log:
Improvement in reconnect: first disconnect, then destroy neighbours


Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2011-12-20 15:41:11 UTC (rev 
18721)
+++ gnunet/src/transport/transport_api.c        2011-12-20 15:48:22 UTC (rev 
18722)
@@ -933,8 +933,6 @@
   struct GNUNET_TRANSPORT_TransmitHandle *th;
 
   GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
-  /* Forget about all neighbours that we used to be connected to */
-  GNUNET_CONTAINER_multihashmap_iterate (h->neighbours, &neighbour_delete, h);
   if (NULL != h->cth)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth);
@@ -945,6 +943,8 @@
     GNUNET_CLIENT_disconnect (h->client, GNUNET_YES);
     h->client = NULL;
   }
+  /* Forget about all neighbours that we used to be connected to */
+  GNUNET_CONTAINER_multihashmap_iterate (h->neighbours, &neighbour_delete, h);
   if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (h->quota_task);