[GNUnet-SVN] r38204 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2016-10-26 06:20:47 +0200 (Wed, 26 Oct 2016)
New Revision: 38204

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
Log:
- send connection keepalive if tunnel is unable to send traffic yet

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-10-26 04:20:46 UTC 
(rev 38203)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2016-10-26 04:20:47 UTC 
(rev 38204)
@@ -1136,6 +1136,7 @@
 {
   struct GNUNET_MessageHeader msg;
   struct CadetFlowControl *fc;
+  int tunnel_ready;
 
   GCC_check_connections ();
   LOG (GNUNET_ERROR_TYPE_INFO,
@@ -1144,7 +1145,9 @@
 
   GNUNET_assert (NULL != c->t);
   fc = fwd ? &c->fwd_fc : &c->bck_fc;
-  if (0 < fc->queue_n || GNUNET_YES == GCT_has_queued_traffic (c->t))
+  tunnel_ready = GNUNET_YES == GCT_has_queued_traffic (c->t)
+                 && CADET_TUNNEL_KEY_OK <= GCT_get_estate (c->t);
+  if (0 < fc->queue_n || tunnel_ready)
   {
     LOG (GNUNET_ERROR_TYPE_INFO, "not sending keepalive, traffic in queue\n");
     return;