diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-26 13:01:54 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-06-26 13:01:54 +0000 |
commit | 5f80e27a31542a0a1f8c8eb862216aacfdb35312 (patch) | |
tree | d2b86429ca59f0e431576d32c88763fdfd3a725e /src/transport/gnunet-service-transport_neighbours.c | |
parent | d58f8ab1d80965979e5574accde7b5d7b11d2805 (diff) | |
download | gnunet-5f80e27a31542a0a1f8c8eb862216aacfdb35312.tar.gz gnunet-5f80e27a31542a0a1f8c8eb862216aacfdb35312.zip |
fix for mantis 0002462
Diffstat (limited to 'src/transport/gnunet-service-transport_neighbours.c')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 9c7a70a96..6c3486691 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1255,8 +1255,9 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) | |||
1255 | 1255 | ||
1256 | /** | 1256 | /** |
1257 | * Send keepalive message to the neighbour. Must only be called | 1257 | * Send keepalive message to the neighbour. Must only be called |
1258 | * if we are on 'connected' state. Will internally determine | 1258 | * if we are on 'connected' state or while trying to switch addresses. |
1259 | * if a keepalive is truly needed (so can always be called). | 1259 | * Will internally determine if a keepalive is truly needed (so can |
1260 | * always be called). | ||
1260 | * | 1261 | * |
1261 | * @param n neighbour that went idle and needs a keepalive | 1262 | * @param n neighbour that went idle and needs a keepalive |
1262 | */ | 1263 | */ |
@@ -1265,7 +1266,9 @@ send_keepalive (struct NeighbourMapEntry *n) | |||
1265 | { | 1266 | { |
1266 | struct GNUNET_MessageHeader m; | 1267 | struct GNUNET_MessageHeader m; |
1267 | 1268 | ||
1268 | GNUNET_assert (S_CONNECTED == n->state); | 1269 | GNUNET_assert ((S_CONNECTED == n->state) || |
1270 | (S_CONNECTED_SWITCHING_BLACKLIST == n->state) || | ||
1271 | (S_CONNECTED_SWITCHING_CONNECT_SENT)); | ||
1269 | if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value > 0) | 1272 | if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value > 0) |
1270 | return; /* no keepalive needed at this time */ | 1273 | return; /* no keepalive needed at this time */ |
1271 | m.size = htons (sizeof (struct GNUNET_MessageHeader)); | 1274 | m.size = htons (sizeof (struct GNUNET_MessageHeader)); |