From: Martin Willi <martin@revosec.ch>
Date: Fri, 9 May 2014 06:39:55 +0000 (+0200)
Subject: child-sa: Reclaim old state if SA updating is not supported
X-Git-Tag: 5.2.0dr3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1b01840b6abfedd4cc86c76456306ef76d81b4e;p=thirdparty%2Fstrongswan.git

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.
---

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;
 			}
 		}