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

[gnunet]

Author: wachs
Date: 2012-06-18 15:00:11 +0200 (Mon, 18 Jun 2012)
New Revision: 22078

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

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2012-06-18 12:59:04 UTC 
(rev 22077)
+++ gnunet/src/transport/gnunet-service-transport.c     2012-06-18 13:00:11 UTC 
(rev 22078)
@@ -357,7 +357,7 @@
   if (GNUNET_NO == ret)
   {
     /* This was a session currently not used by
-     * neighbours so we have to destroy it here */
+     * neighbours so we have to try to destroy it here */
     GNUNET_ATS_address_destroyed (GST_ats, &address, session);
   }
 }

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-18 
12:59:04 UTC (rev 22077)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-18 
13:00:11 UTC (rev 22078)
@@ -2154,9 +2154,11 @@
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "ATS tells us to switch to address '%s' for peer `%s'\n",
+              "ATS tells us to switch to address '%s' session %p for peer 
`%s'\n",
               (address->address_length != 0) ? GST_plugins_a2s (address): 
"<inbound>",
+              session,
               GNUNET_i2s (peer));
+
   switch (n->state)
   {
   case S_NOT_CONNECTED:
@@ -2602,10 +2604,10 @@
                           GNUNET_NO);
     connect_notify_cb (callback_cls, &n->id, ats, ats_count);
     /* Tell ATS that the outbound session we created to send CONNECT was 
successfull */
-    GNUNET_ATS_address_add(GST_ats,
-                           n->primary_address.address,
-                           n->primary_address.session,
-                           ats, ats_count);
+    GNUNET_ATS_address_add (GST_ats,
+                            n->primary_address.address,
+                            n->primary_address.session,
+                            ats, ats_count);
     set_address (&n->primary_address,
                 n->primary_address.address,
                 n->primary_address.session,
@@ -2650,6 +2652,10 @@
     n->state = S_CONNECTED;
     n->timeout = GNUNET_TIME_relative_to_absolute 
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
     GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
+    GNUNET_ATS_address_add(GST_ats,
+                           n->alternative_address.address,
+                           n->alternative_address.session,
+                           ats, ats_count);
     set_address (&n->primary_address,
                 n->alternative_address.address,
                 n->alternative_address.session,
@@ -2856,6 +2862,10 @@
                         ++neighbours_connected,
                         GNUNET_NO);
   connect_notify_cb (callback_cls, &n->id, ats, ats_count);
+  GNUNET_ATS_address_add(GST_ats,
+                         n->primary_address.address,
+                         n->primary_address.session,
+                         ats, ats_count);
   set_address (&n->primary_address,
               n->primary_address.address,
               n->primary_address.session,