From 17949695bfd986c1cf32eee0460f02528026bbb9 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Mon, 21 May 2012 14:53:40 +0200
Subject: [PATCH] Cancel pending retransmits when flushing active task queue

---
 src/libcharon/sa/ikev1/task_manager_v1.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index b52a7e923..16391257c 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;