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

[gnunet]

Author: wachs
Date: 2012-06-26 15:01:54 +0200 (Tue, 26 Jun 2012)
New Revision: 22293

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


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-26 
12:56:11 UTC (rev 22292)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-26 
13:01:54 UTC (rev 22293)
@@ -1255,8 +1255,9 @@
 
 /**
  * Send keepalive message to the neighbour.  Must only be called
- * if we are on 'connected' state.  Will internally determine
- * if a keepalive is truly needed (so can always be called).
+ * if we are on 'connected' state or while trying to switch addresses.
+ * Will internally determine if a keepalive is truly needed (so can
+ * always be called).
  *
  * @param n neighbour that went idle and needs a keepalive
  */
@@ -1265,7 +1266,9 @@
 {
   struct GNUNET_MessageHeader m;
 
-  GNUNET_assert (S_CONNECTED == n->state);
+  GNUNET_assert ((S_CONNECTED == n->state) ||
+                 (S_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
+                 (S_CONNECTED_SWITCHING_CONNECT_SENT));
   if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value > 0)
     return; /* no keepalive needed at this time */
   m.size = htons (sizeof (struct GNUNET_MessageHeader));