From b1b01840b6abfedd4cc86c76456306ef76d81b4e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 9 May 2014 08:39:55 +0200 Subject: [PATCH] child-sa: Reclaim old state if SA updating is not supported If the state stays at UPDATING, the fallback using IKEv1 rekeying fails as the task manager refuses to rekey a CHILD_SA in non-INSTALLED state. --- src/libcharon/sa/child_sa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c index 720a585539..847cfc78f7 100644 --- a/src/libcharon/sa/child_sa.c +++ b/src/libcharon/sa/child_sa.c @@ -916,6 +916,7 @@ METHOD(child_sa_t, update, status_t, this->other_addr, this->my_addr, other, me, this->encap, encap, this->mark_in) == NOT_SUPPORTED) { + set_state(this, old); return NOT_SUPPORTED; } } @@ -929,6 +930,7 @@ METHOD(child_sa_t, update, status_t, this->my_addr, this->other_addr, me, other, this->encap, encap, this->mark_out) == NOT_SUPPORTED) { + set_state(this, old); return NOT_SUPPORTED; } } -- 2.47.2