From: Martin Willi <martin@revosec.ch>
Date: Mon, 21 May 2012 12:53:40 +0000 (+0200)
Subject: Cancel pending retransmits when flushing active task queue
X-Git-Tag: 5.0.0~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17949695bfd986c1cf32eee0460f02528026bbb9;p=thirdparty%2Fstrongswan.git

Cancel pending retransmits when flushing active task queue
---

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index b52a7e9232..16391257cd 100644
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -227,6 +227,10 @@ METHOD(task_manager_t, flush_queue, void,
 	{
 		case TASK_QUEUE_ACTIVE:
 			list = this->active_tasks;
+			/* cancel pending retransmits */
+			this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
+			DESTROY_IF(this->initiating.packet);
+			this->initiating.packet = NULL;
 			break;
 		case TASK_QUEUE_PASSIVE:
 			list = this->passive_tasks;