From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 22 Jul 2014 16:51:57 +0000 (+0200)
Subject: ikev2: Insert MOBIKE tasks at the front of the queue
X-Git-Tag: 5.2.1dr1~65^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3293d146289d7c05e6c6089ae1f7cdbcea378e63;p=thirdparty%2Fstrongswan.git

ikev2: Insert MOBIKE tasks at the front of the queue

In case we have no usable path to the other peer there is no point in
initiating any other tasks (like rekeying).
---

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index ada798bdc5..630c902f4c 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1246,6 +1246,8 @@ METHOD(task_manager_t, process_message, status_t,
 METHOD(task_manager_t, queue_task, void,
 	private_task_manager_t *this, task_t *task)
 {
+	int pos = ARRAY_TAIL;
+
 	if (task->get_type(task) == TASK_IKE_MOBIKE)
 	{	/*  there is no need to queue more than one mobike task */
 		enumerator_t *enumerator;
@@ -1262,9 +1264,12 @@ METHOD(task_manager_t, queue_task, void,
 			}
 		}
 		enumerator->destroy(enumerator);
+		/* insert MOBIKE tasks first as we currently might not have a usable
+		 * path to initiate any other tasks */
+		pos = ARRAY_HEAD;
 	}
 	DBG2(DBG_IKE, "queueing %N task", task_type_names, task->get_type(task));
-	array_insert(this->queued_tasks, ARRAY_TAIL, task);
+	array_insert(this->queued_tasks, pos, task);
 }
 
 /**