stop destroy task if connection goes up

diff --git a/src/cadet/TODO b/src/cadet/TODO
index 03bf6eae10a1f674836556403d46b4d4eab5c940..820efab7a60eb2846548fda764ec709367959f95 100644 (file)
--- a/src/cadet/TODO
+++ b/src/cadet/TODO
@@ -1,7 +1,6 @@
 - URGENT: Congestion/flow control (CHANNEL):
   + estimate max bandwidth using bursts and use to for CONGESTION CONTROL!
    (and figure out how/where to use this!)
-  + figure out flow control without ACKs (unreliable traffic!)
 
 - HIGH: revisit handling of 'unbuffered' traffic! (CHANNEL/TUNNEL)
         (need to push down through tunnel into connection selection);
@@ -20,7 +19,6 @@
         point of breakage) as well as connection/route (CORE)
 
 - OPTIMIZATION: proper connection evaluation during connection management:
-  + PATHS: path desirability score calculations are not done
   + TUNNELS:
     * consider quality of current connection set when deciding
       how often to do maintenance

diff --git a/src/cadet/gnunet-service-cadet-new_peer.c b/src/cadet/gnunet-service-cadet-new_peer.c
index d9a87600bf6e5cd7864c268463c1a699379527f6..539b0446021903cc1a15e2c47ed94c312881c969 100644 (file)
--- a/src/cadet/gnunet-service-cadet-new_peer.c
+++ b/src/cadet/gnunet-service-cadet-new_peer.c
@@ -1011,6 +1011,11 @@ GCP_add_connection (struct CadetPeer *cp,
                                                      &GCC_get_id (cc)->connection_of_tunnel,
                                                      cc,
                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  if (NULL != cp->destroy_task)
+  {
+    GNUNET_SCHEDULER_cancel (cp->destroy_task);
+    cp->destroy_task = NULL;
+  }
 }
 
 
@@ -1032,6 +1037,7 @@ GCP_remove_connection (struct CadetPeer *cp,
                  GNUNET_CONTAINER_multishortmap_remove (cp->connections,
                                                         &GCC_get_id (cc)->connection_of_tunnel,
                                                         cc));
+  consider_peer_destroy (cp);
 }