From: Martin Willi <martin@revosec.ch>
Date: Tue, 13 Dec 2011 10:19:08 +0000 (+0100)
Subject: Reset task manager state when build() completes an exchange (quick mode)
X-Git-Tag: 5.0.0~338^2~9^2~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41fbde45442f2e33beebb4e0b6075a1d6a9ad948;p=thirdparty%2Fstrongswan.git

Reset task manager state when build() completes an exchange (quick mode)
---

diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/task_manager_v1.c
index 6a9592fe57..b292934bca 100755
--- a/src/libcharon/sa/task_manager_v1.c
+++ b/src/libcharon/sa/task_manager_v1.c
@@ -415,8 +415,10 @@ METHOD(task_manager_t, initiate, status_t,
 	}
 	enumerator->destroy(enumerator);
 
-	/* update exchange type if a task changed it */
-	this->initiating.type = message->get_exchange_type(message);
+	if (this->active_tasks->get_count(this->active_tasks) == 0)
+	{	/* tasks completed, no exchange active anymore */
+		this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
+	}
 	this->initiating.seqnr++;
 
 	status = this->ike_sa->generate_message(this->ike_sa, message,
@@ -442,7 +444,7 @@ METHOD(task_manager_t, initiate, status_t,
 	this->initiating.packet = NULL;
 
 	/* close after sending an INFORMATIONAL error but not yet established */
-	if (this->initiating.type == INFORMATIONAL_V1 &&
+	if (exchange == INFORMATIONAL_V1 &&
 		this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING)
 	{
 		return FAILED;