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 b52a7e92326dd7eca7442b3c3793886008353936..16391257cdd6f6b643dc438344eb3b22f6162a09 100644 (file)
--- 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;