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

[gnunet]

Author: grothoff
Date: 2010-12-01 20:21:41 +0100 (Wed, 01 Dec 2010)
New Revision: 13865

Modified:
   gnunet/src/transport/transport_api.c
Log:
do not free if still connected

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2010-12-01 19:17:19 UTC (rev 
13864)
+++ gnunet/src/transport/transport_api.c        2010-12-01 19:21:41 UTC (rev 
13865)
@@ -1374,6 +1374,7 @@
                              GNUNET_TIME_UNIT_FOREVER_REL, 
&send_transport_request_connect, trcm);
 }
 
+
 /**
  * Add neighbour to our list
  *
@@ -1412,6 +1413,7 @@
   return n;
 }
 
+
 /**
  * Iterator over hash map entries, for deleting state of a neighbor.
  *
@@ -1509,11 +1511,11 @@
 #endif
   handle->in_disconnect = GNUNET_YES;
 
-  GNUNET_assert(GNUNET_SYSERR !=
-                GNUNET_CONTAINER_multihashmap_iterate(handle->neighbours,
-                                                      &delete_neighbours,
-                                                      handle));
-  GNUNET_CONTAINER_multihashmap_destroy(handle->neighbours);
+  GNUNET_assert (GNUNET_SYSERR !=
+                GNUNET_CONTAINER_multihashmap_iterate(handle->neighbours,
+                                                      &delete_neighbours,
+                                                      handle));
+  GNUNET_CONTAINER_multihashmap_destroy (handle->neighbours);
 
   while (NULL != (hwl = handle->hwl_head))
     {
@@ -2005,7 +2007,8 @@
       break;
     case TS_QUEUED:
       n->transmit_stage = TS_NEW;
-      if (n->in_disconnect == GNUNET_NO)
+      if ( (n->in_disconnect == GNUNET_NO) &&
+          (n->is_connected == GNUNET_NO) )
        neighbour_free (n);
       break;
     case TS_TRANSMITTED: