From: Martin Willi <martin@revosec.ch>
Date: Mon, 21 May 2012 12:05:01 +0000 (+0200)
Subject: Wrap task managers flush_queue() in IKE_SA
X-Git-Tag: 5.0.0~241
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbc1a20ffe69fae5ae7fc216873c7ee7d737e103;p=thirdparty%2Fstrongswan.git

Wrap task managers flush_queue() in IKE_SA
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 54bc109d5b..967ad75f2a 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1787,6 +1787,12 @@ METHOD(ike_sa_t, create_task_enumerator, enumerator_t*,
 	return this->task_manager->create_task_enumerator(this->task_manager, queue);
 }
 
+METHOD(ike_sa_t, flush_queue, void,
+	private_ike_sa_t *this, task_queue_t queue)
+{
+	this->task_manager->flush_queue(this->task_manager, queue);
+}
+
 METHOD(ike_sa_t, queue_task, void,
 	private_ike_sa_t *this, task_t *task)
 {
@@ -2058,6 +2064,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator,
 			.add_configuration_attribute = _add_configuration_attribute,
 			.set_kmaddress = _set_kmaddress,
 			.create_task_enumerator = _create_task_enumerator,
+			.flush_queue = _flush_queue,
 			.queue_task = _queue_task,
 #ifdef ME
 			.act_as_mediation_server = _act_as_mediation_server,
diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index 0644bab78b..a3c3de81cc 100644
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -968,6 +968,13 @@ struct ike_sa_t {
 	 */
 	enumerator_t* (*create_task_enumerator)(ike_sa_t *this, task_queue_t queue);
 
+	/**
+	 * Flush a task queue, cancelling all tasks in it.
+	 *
+	 * @param queue			queue type to flush
+	 */
+	void (*flush_queue)(ike_sa_t *this, task_queue_t queue);
+
 	/**
 	 * Queue a task for initiaton to the task manager.
 	 *