From: Martin Willi <martin@revosec.ch>
Date: Fri, 21 Nov 2014 11:10:16 +0000 (+0100)
Subject: ikev2: Prevent IKE_SA rekeying if we are currently retrying a CHILD_SA rekey
X-Git-Tag: 5.2.2dr1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8891ed5478723a34e9a33151b77b563055b99684;p=thirdparty%2Fstrongswan.git

ikev2: Prevent IKE_SA rekeying if we are currently retrying a CHILD_SA rekey
---

diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
index 444ac6ade1..fdab03801a 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
@@ -163,6 +163,7 @@ METHOD(task_t, process_r, status_t,
 		{
 			case CHILD_CREATED:
 			case CHILD_REKEYING:
+			case CHILD_RETRYING;
 			case CHILD_DELETING:
 				/* we do not allow rekeying while we have children in-progress */
 				DBG1(DBG_IKE, "peer initiated rekeying, but a child is half-open");