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

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index bc8267a4d1409e72197856b43b82494bc7768c2d..7dfe5b25a7a7a3d383d9e29f515c87bc6926c5b1 100644 (file)
--- 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 b005cbe064c9adb0c5136a85b70735ae6b579c2c..0f626460737570d2d65ad6eaf164d541632249d3 100644 (file)
--- 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 ();