From f6cdf9dcdfa4100da7c52d79840430a294ae8867 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Mon, 27 Apr 2015 19:14:38 +0000 Subject: [PATCH] - use axolotl by default --- src/cadet/gnunet-service-cadet_tunnel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index adae45a25..62936e61b 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c @@ -2230,6 +2230,10 @@ handle_ephemeral (struct CadetTunnel *t, { destroy_ax (t); t->enc_type = CADET_Fallback; + if (NULL != t->rekey_task) + GNUNET_SCHEDULER_cancel (t->rekey_task); + create_kx_ctx (t); + rekey_tunnel (t, NULL); } /** @@ -2735,11 +2739,8 @@ GCT_change_cstate (struct CadetTunnel* t, enum CadetTunnelCState cstate) } else if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate) { - LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate triggered rekey\n"); - if (NULL != t->rekey_task) - GNUNET_SCHEDULER_cancel (t->rekey_task); - create_kx_ctx (t); - rekey_tunnel (t, NULL); + LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate triggered kx\n"); + GCT_send_ax_kx (t); } } t->cstate = cstate; -- 2.25.1