- On a new EPHM, do a immediate rekey

2 files changed, 4 insertions, 3 deletions

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 5425e258a..d46a0a399 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -1841,7 +1841,7 @@ GCC_handle_broken (void* cls,
      * is popped! Do not use 'c' after the call. */
     while (NULL != (out_msg = GCP_connection_pop (neighbor, c, &del)))
     {
-      pending -= del + 1;
+      pending -= del + 1; /* Substract the deleted messages + the popped one */
       GCT_resend_message (out_msg, t);
     }
     /* All pending messages should have been popped,
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index fffdb9102..2d8aa90b6 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -1838,8 +1838,9 @@ handle_ephemeral (struct CadetTunnel *t,
     {
       t->estate = CADET_TUNNEL_KEY_REKEY;
     }
-    if (GNUNET_SCHEDULER_NO_TASK == t->rekey_task)
-      t->rekey_task = GNUNET_SCHEDULER_add_now (rekey_tunnel, t);
+    if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+      GNUNET_SCHEDULER_cancel (t->rekey_task);
+    t->rekey_task = GNUNET_SCHEDULER_add_now (rekey_tunnel, t);
   }
   else if (CADET_TUNNEL_KEY_OK == t->estate)
   {