From 20dfbcad0875fc0b3fa2be1478d3b5adedee8e92 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 15 Jan 2021 16:28:24 +0100 Subject: [PATCH] ha: Register new IKE_SAs before calling inherit_post() --- src/libcharon/plugins/ha/ha_dispatcher.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c index ff75cb5c1a..3c608e614c 100644 --- a/src/libcharon/plugins/ha/ha_dispatcher.c +++ b/src/libcharon/plugins/ha/ha_dispatcher.c @@ -259,7 +259,10 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message if (ok) { if (old_sa) - { + { /* register IKE_SA before calling inherit_post() so no scheduled + * jobs are lost */ + charon->ike_sa_manager->checkout_new(charon->ike_sa_manager, + old_sa); ike_sa->inherit_pre(ike_sa, old_sa); ike_sa->inherit_post(ike_sa, old_sa); charon->ike_sa_manager->checkin_and_destroy(