From: Matthias Wachs <wachs@net.in.tum.de>
Date: Wed, 26 Oct 2011 13:16:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~16214
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=151cacabd28ce4b171e833db6651321c13af8f22;p=oweals%2Fgnunet.git

---

diff --git a/src/transport/gnunet-service-transport_neighbours_fsm.c b/src/transport/gnunet-service-transport_neighbours_fsm.c
index 8759eff08..e149facd0 100644
--- a/src/transport/gnunet-service-transport_neighbours_fsm.c
+++ b/src/transport/gnunet-service-transport_neighbours_fsm.c
@@ -975,6 +975,14 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
   size_t len;
   size_t ret;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "SWITCH! Peer `%4s' switches to plugin `%s' address '%s' session %X\n",
+              GNUNET_i2s (peer), plugin_name,
+              (address_len == 0) ? "<inbound>" : GST_plugins_a2s (plugin_name,
+                                                                  address,
+                                                                  address_len),
+              session);
+
   GNUNET_assert (neighbours != NULL);
   n = lookup_neighbour (peer);
   if (NULL == n)
@@ -987,7 +995,9 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
     return GNUNET_NO;
   }
 
-  change_state (n, S_CONNECT_SENT);
+  // FIXME state transition when peer is connected?
+  if (!is_connected(n))
+    change_state (n, S_CONNECT_SENT);
 
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1643,6 +1653,19 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
     send_disconnect(n);
     return;
   }
+
+  if (NULL != session)
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                     "transport-ats",
+                     "Giving ATS session %p of plugin %s for peer %s\n",
+                     session,
+                     plugin_name,
+                     GNUNET_i2s (peer));
+  GNUNET_ATS_address_update (GST_ats,
+                             peer,
+                             plugin_name, sender_address, sender_address_len,
+                             session, ats, ats_count);
+
   neighbour_connected (n, ats, ats_count, GNUNET_YES);
 }
 
@@ -1681,6 +1704,18 @@ GST_neighbours_handle_ack (const struct GNUNET_MessageHeader *message,
   if (is_connected(n))
     return;
 
+  if (NULL != session)
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                     "transport-ats",
+                     "Giving ATS session %p of plugin %s for peer %s\n",
+                     session,
+                     plugin_name,
+                     GNUNET_i2s (peer));
+  GNUNET_ATS_address_update (GST_ats,
+                             peer,
+                             plugin_name, sender_address, sender_address_len,
+                             session, ats, ats_count);
+
   neighbour_connected (n, ats, ats_count, GNUNET_NO);
 }
 
@@ -1759,7 +1794,7 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
   if (ts.abs_value > n->connect_ts.abs_value)
   {
     if (NULL != session)
-      GNUNET_log_from (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
 		       "transport-ats",
 		       "Giving ATS session %p of plugin %s for peer %s\n",
 		       session,