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

[gnunet]

Author: wachs
Date: 2012-04-24 13:40:45 +0200 (Tue, 24 Apr 2012)
New Revision: 21118

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


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-04-24 
10:18:09 UTC (rev 21117)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-04-24 
11:40:45 UTC (rev 21118)
@@ -65,8 +65,6 @@
 
 #define SETUP_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 15)
 
-#define  TEST_NEW_CODE GNUNET_NO
-
 /**
  * Entry in neighbours.
  */
@@ -1431,7 +1429,8 @@
               "Failed to send CONNECT_MSG to peer `%4s' with address '%s' 
session %X, asking ATS for new address \n",
               GNUNET_i2s (&n->id), GST_plugins_a2s (n->address), n->session);
 #endif
-  change_state (n, S_NOT_CONNECTED);
+  if (n->state != S_NOT_CONNECTED)
+    change_state (n, S_NOT_CONNECTED);
   GNUNET_assert (strlen (cc->address->transport_name) > 0);
   GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
 
@@ -1504,7 +1503,7 @@
   }
 
   /* checks successful and neighbour != NULL */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
               "ATS tells us to switch to address '%s' session %p for peer `%s' 
in state `%s'\n",
               (address->address_length != 0) ? GST_plugins_a2s (address): 
"<inbound>",
               session,