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 54bc109d5b63c3981630504b82b45c5cb8d1495f..967ad75f2ae9c93ec1ef75b7fd03bfe62e1f13f5 100644 (file)
--- 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 0644bab78b9865115985b4e76f89be32f05d0191..a3c3de81ccbd1901537983202505adee20db00d8 100644 (file)
--- 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.
         *