ikev1: Handle queued TRANSACTION messages only after processing replies

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 0b329e03a9b1e89cf5a6d2f71b75e7ae97b50e9a..a027b749e72eeb499593ffcf59aab7942e58b631 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1167,7 +1167,8 @@ static status_t process_response(private_task_manager_t *this,
        this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
        clear_packets(this->initiating.packets);
 
-       if (this->queued && this->active_tasks->get_count(this->active_tasks) == 0)
+       if (this->queued && !this->active_tasks->get_count(this->active_tasks) &&
+               this->queued->get_exchange_type(this->queued) == TRANSACTION)
        {
                queued = this->queued;
                this->queued = NULL;