From: Matthias Wachs <wachs@net.in.tum.de>
Date: Thu, 16 Feb 2012 14:47:15 +0000 (+0000)
Subject: - fix for  Illegal state transition from `S_FAST_RECONNECT' to `S_CONNECT_RECV' in... 
X-Git-Tag: initial-import-from-subversion-38251~14836
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f63b2a234432a37789ea2694b1bd9494242ae8f6;p=oweals%2Fgnunet.git

- fix for  Illegal state transition from `S_FAST_RECONNECT' to `S_CONNECT_RECV' in line 2594
---

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index bc8267a4d..7dfe5b25a 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -2644,9 +2644,9 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
   GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count);
 
   n = lookup_neighbour (peer);
-  if ((n != NULL) && (S_CONNECTED == n->state))
+  if ((n != NULL) && ((S_CONNECTED == n->state) || (S_FAST_RECONNECT == n->state)))
   {
-    /* connected peer switches addresses */
+    /* connected peer switches addresses or is trying to do a fast reconnect*/
     return;
   }
 
diff --git a/src/transport/test_transport_api_restart_1peer.c b/src/transport/test_transport_api_restart_1peer.c
index b005cbe06..0f6264607 100644
--- a/src/transport/test_transport_api_restart_1peer.c
+++ b/src/transport/test_transport_api_restart_1peer.c
@@ -221,7 +221,7 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Restarted peers connected and message was sent, stopping test...\n");
       ok = 0;
       end ();