cancel tunnel destruction if we get another channel during the grace period

diff --git a/src/cadet/TODO b/src/cadet/TODO
index cbce04e2f1e8ba5fb09497d9e8c228873b8bc3e1..f2aed163d8e25bff9406457c6b35ffc53d327c75 100644 (file)
--- a/src/cadet/TODO
+++ b/src/cadet/TODO
@@ -8,7 +8,9 @@
         (need to push down through tunnel into connection selection);
         At Tunnel-level, try to create connections that match channel
         preferences (buffered/unbuffered) and select connections for
-         channel traffic that match channel preferences.
+        channel traffic that match channel preferences.
+        BUT: not sure this is ideal, discloses traffic type to
+        routers. We don't want that! (Maybe revise decision to do this?)
 
 - HIGH: revisit handling of 'buffered' traffic: 4 is a rather small buffer; (CHANNEL)
         maybe reserve more bits in 'options' to allow for buffer size control?

diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c b/src/cadet/gnunet-service-cadet-new_tunnels.c
index ff07ac6653866e7378284a22b4a234e95a5d7bc5..a9f8dfffc3239807e65c7cb3ff07a57a7bcd83ac 100644 (file)
--- a/src/cadet/gnunet-service-cadet-new_tunnels.c
+++ b/src/cadet/gnunet-service-cadet-new_tunnels.c
@@ -2712,6 +2712,11 @@ handle_plaintext_channel_open (void *cls,
                                   copen->ctn,
                                   &copen->port,
                                   ntohl (copen->opt));
+  if (NULL != t->destroy_task)
+  {
+    GNUNET_SCHEDULER_cancel (t->destroy_task);
+    t->destroy_task = NULL;
+  }
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CONTAINER_multihashmap32_put (t->channels,
                                                       ntohl (copen->ctn.cn),