From 383ec46a4e37bdc9d31a28131b9c39dd31ed6b05 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 4 Aug 2015 14:00:28 +0000 Subject: [PATCH] - cancel pending AX_KX when forced to send a KX by peer, fix #3927 --- src/cadet/gnunet-service-cadet_tunnel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index 4ecb9f599..34f5e4aa0 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c @@ -2906,7 +2906,11 @@ handle_kx_ax (struct CadetTunnel *t, const struct GNUNET_CADET_AX_KX *msg) } 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))) { -- 2.25.1