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

[gnunet]

Author: bartpolot
Date: 2015-08-04 16:00:28 +0200 (Tue, 04 Aug 2015)
New Revision: 36204

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- cancel pending AX_KX when forced to send a KX by peer, fix #3927

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-08-04 14:00:27 UTC 
(rev 36203)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-08-04 14:00:28 UTC 
(rev 36204)
@@ -2906,7 +2906,11 @@
   }
 
   if (0 != (GNUNET_CADET_AX_KX_FLAG_FORCE_REPLY & ntohl (msg->flags)))
+  {
+    if (NULL != t->rekey_task)
+      GNUNET_SCHEDULER_cancel (t->rekey_task);
     GCT_send_ax_kx (t, GNUNET_NO);
+  }
 
   if (0 == memcmp (&ax->DHRr, &msg->ratchet_key, sizeof(msg->ratchet_key)))
   {