- don't send KEEPALIVE if the tunnel has traffic queued

3 files changed, 34 insertions, 1 deletions

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 8cce9eae4..e0a2039cb 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -1064,8 +1064,9 @@ send_connection_keepalive (struct CadetConnection *c, int fwd)
        "keepalive %s for connection %s\n",
        GC_f2s (fwd), GCC_2s (c));
 
+  GNUNET_assert (NULL != c->t);
   fc = fwd ? &c->fwd_fc : &c->bck_fc;
-  if (0 < fc->queue_n)
+  if (0 < fc->queue_n || GNUNET_YES == GCT_has_queued_traffic (c->t))
   {
     LOG (GNUNET_ERROR_TYPE_INFO, "not sending keepalive, traffic in queue\n");
     return;
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index 11016671e..226c9a846 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -3705,7 +3705,13 @@ GCT_destroy (struct CadetTunnel *t)
   while (NULL != t->tq_head)
   {
     /* Should have been cleaned by destuction of channel. */
+    struct GNUNET_MessageHeader *mh;
+
     GNUNET_break (0);
+    mh = (struct GNUNET_MessageHeader *) &t->tq_head[1];
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "message left behind on tunnel shutdown: %s\n",
+         GC_m2s (ntohs (mh->type)));
     unqueue_data (t->tq_head);
   }
 
@@ -4189,6 +4195,21 @@ GCT_cancel (struct CadetTunnelQueue *q)
 
 
 /**
+ * Check if the tunnel has queued traffic.
+ *
+ * @param t Tunnel to check.
+ *
+ * @return #GNUNET_YES if there is queued traffic
+ *         #GNUNET_NO otherwise
+ */
+int
+GCT_has_queued_traffic (struct CadetTunnel *t)
+{
+  return (NULL != t->tq_head) ? GNUNET_YES : GNUNET_NO;
+}
+
+
+/**
  * Sends an already built message on a tunnel, encrypting it and
  * choosing the best connection if not provided.
  *
diff --git a/src/cadet/gnunet-service-cadet_tunnel.h b/src/cadet/gnunet-service-cadet_tunnel.h
index a2504436b..c7a795129 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.h
+++ b/src/cadet/gnunet-service-cadet_tunnel.h
@@ -450,6 +450,17 @@ GCT_cancel (struct CadetTunnelQueue *q);
 
 
 /**
+ * Check if the tunnel has queued traffic.
+ *
+ * @param t Tunnel to check.
+ *
+ * @return #GNUNET_YES if there is queued traffic
+ *         #GNUNET_NO otherwise
+ */
+int
+GCT_has_queued_traffic (struct CadetTunnel *t);
+
+/**
  * Sends an already built message on a tunnel, encrypting it and
  * choosing the best connection.
  *