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

[gnunet]

Author: wachs
Date: 2012-02-16 15:47:15 +0100 (Thu, 16 Feb 2012)
New Revision: 19821

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/test_transport_api_restart_1peer.c
Log:
- fix for  Illegal state transition from `S_FAST_RECONNECT' to `S_CONNECT_RECV' 
in line 2594 


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-02-16 
14:29:25 UTC (rev 19820)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-02-16 
14:47:15 UTC (rev 19821)
@@ -2644,9 +2644,9 @@
   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;
   }
 

Modified: gnunet/src/transport/test_transport_api_restart_1peer.c
===================================================================
--- gnunet/src/transport/test_transport_api_restart_1peer.c     2012-02-16 
14:29:25 UTC (rev 19820)
+++ gnunet/src/transport/test_transport_api_restart_1peer.c     2012-02-16 
14:47:15 UTC (rev 19821)
@@ -221,7 +221,7 @@
     }
     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 ();