From: Martin Willi <martin@revosec.ch>
Date: Wed, 14 Dec 2011 14:33:06 +0000 (+0100)
Subject: Close IKE_SA directly after sending the delete
X-Git-Tag: 5.0.0~338^2~9^2~210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07095794a1ecee5b084c5b69f7d5a9fefd737c9e;p=thirdparty%2Fstrongswan.git

Close IKE_SA directly after sending the delete
---

diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/task_manager_v1.c
index bdb55a07e2..494fe84c3a 100755
--- a/src/libcharon/sa/task_manager_v1.c
+++ b/src/libcharon/sa/task_manager_v1.c
@@ -462,11 +462,19 @@ METHOD(task_manager_t, initiate, status_t,
 	this->initiating.packet->destroy(this->initiating.packet);
 	this->initiating.packet = NULL;
 
-	/* close after sending an INFORMATIONAL error but not yet established */
-	if (exchange == INFORMATIONAL_V1 &&
-		this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING)
+	if (exchange == INFORMATIONAL_V1)
 	{
-		return FAILED;
+		switch (this->ike_sa->get_state(this->ike_sa))
+		{
+			case IKE_CONNECTING:
+				/* close after sending an INFORMATIONAL when unestablished */
+				return FAILED;
+			case IKE_DELETING:
+				/* close after sending a DELETE */
+				return DESTROY_ME;
+			default:
+				break;
+		}
 	}
 	return SUCCESS;
 }