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

[gnunet]

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

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- cancel any rekey tasks when calling it directly

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-07-21 00:15:08 UTC 
(rev 33984)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-07-21 00:15:09 UTC 
(rev 33985)
@@ -2197,6 +2197,8 @@
     else if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
     {
       LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate triggered rekey\n");
+      if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+        GNUNET_SCHEDULER_cancel (t->rekey_task);
       rekey_tunnel (t, NULL);
     }
   }