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

[gnunet]

Author: bartpolot
Date: 2014-07-21 02:15:24 +0200 (Mon, 21 Jul 2014)
New Revision: 33996

Modified:
   gnunet/src/cadet/gnunet-service-cadet_connection.c
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- On a new EPHM, do a immediate rekey

Modified: gnunet/src/cadet/gnunet-service-cadet_connection.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_connection.c  2014-07-21 00:15:22 UTC 
(rev 33995)
+++ gnunet/src/cadet/gnunet-service-cadet_connection.c  2014-07-21 00:15:24 UTC 
(rev 33996)
@@ -1841,7 +1841,7 @@
      * 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,

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-07-21 00:15:22 UTC 
(rev 33995)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-07-21 00:15:24 UTC 
(rev 33996)
@@ -1838,8 +1838,9 @@
     {
       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)
   {