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

[gnunet]

Author: wachs
Date: 2012-06-29 18:48:14 +0200 (Fri, 29 Jun 2012)
New Revision: 22395

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
- " undo"


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-29 
16:43:11 UTC (rev 22394)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-29 
16:48:14 UTC (rev 22395)
@@ -870,7 +870,7 @@
 {
   struct MessageQueue *mq;
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
-  struct GNUNET_HELLO_Address *old_address;
+  //struct GNUNET_HELLO_Address *old_address;
 
   n->is_active = NULL; /* always free'd by its own continuation! */
 
@@ -895,10 +895,10 @@
 
 
   /* cut transport-level connection */
-  old_address = GNUNET_HELLO_address_copy(n->primary_address.address);
-  free_address (&n->primary_address);
-  free_address (&n->alternative_address);
+  //old_address = GNUNET_HELLO_address_copy(n->primary_address.address);
 
+
+
   /* FIXME-PLUGIN-API: This does not seem to guarantee that all
      transport sessions eventually get killed due to inactivity; they
      MUST have their own timeout logic (but at least TCP doesn't have
@@ -910,14 +910,16 @@
      wrong. */
 
   if ((GNUNET_NO == keep_sessions) &&
-      (NULL != old_address) &&
-      (NULL != (papi = GST_plugins_find (old_address->transport_name))))
+      (NULL != n->primary_address.address) &&
+      (NULL != (papi = GST_plugins_find 
(n->primary_address.address->transport_name))))
     papi->disconnect (papi->cls, &n->id);
 
-  GNUNET_free (old_address);
 
   n->state = S_DISCONNECT_FINISHED;
 
+  free_address (&n->primary_address);
+  free_address (&n->alternative_address);
+
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap_remove (neighbours,
                                                        &n->id.hashPubKey, n));