Make task managers flush_queue() method public

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 2f47e721ee2007932a08196e02d31817070c888e..38fe8ec0acbeb9a50d9ee75b399e6c7b0606d7c8 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -212,11 +212,10 @@ struct private_task_manager_t {
        u_int32_t dpd_recv;
 };
 
-/**
- * Flush a single task queue
- */
-static void flush_queue(private_task_manager_t *this, linked_list_t *list)
+METHOD(task_manager_t, flush_queue, void,
+       private_task_manager_t *this, task_queue_t queue)
 {
+       linked_list_t *list;
        task_t *task;
 
        if (this->queued)
@@ -224,6 +223,20 @@ static void flush_queue(private_task_manager_t *this, linked_list_t *list)
                this->queued->destroy(this->queued);
                this->queued = NULL;
        }
+       switch (queue)
+       {
+               case TASK_QUEUE_ACTIVE:
+                       list = this->active_tasks;
+                       break;
+               case TASK_QUEUE_PASSIVE:
+                       list = this->passive_tasks;
+                       break;
+               case TASK_QUEUE_QUEUED:
+                       list = this->queued_tasks;
+                       break;
+               default:
+                       return;
+       }
        while (list->remove_last(list, (void**)&task) == SUCCESS)
        {
                task->destroy(task);
@@ -235,9 +248,9 @@ static void flush_queue(private_task_manager_t *this, linked_list_t *list)
  */
 static void flush(private_task_manager_t *this)
 {
-       flush_queue(this, this->queued_tasks);
-       flush_queue(this, this->passive_tasks);
-       flush_queue(this, this->active_tasks);
+       flush_queue(this, TASK_QUEUE_QUEUED);
+       flush_queue(this, TASK_QUEUE_PASSIVE);
+       flush_queue(this, TASK_QUEUE_ACTIVE);
 }
 
 /**
@@ -498,7 +511,7 @@ METHOD(task_manager_t, initiate, status_t,
                                /* processed, but task needs another exchange */
                                continue;
                        case ALREADY_DONE:
-                               flush_queue(this, this->active_tasks);
+                               flush_queue(this, TASK_QUEUE_ACTIVE);
                                flushed = TRUE;
                                break;
                        case FAILED:
@@ -625,7 +638,7 @@ static status_t build_response(private_task_manager_t *this, message_t *request)
                                }
                                continue;
                        case ALREADY_DONE:
-                               flush_queue(this, this->passive_tasks);
+                               flush_queue(this, TASK_QUEUE_PASSIVE);
                                flushed = TRUE;
                                break;
                        case FAILED:
@@ -874,7 +887,7 @@ static status_t process_request(private_task_manager_t *this,
                                continue;
                        case ALREADY_DONE:
                                send_response = FALSE;
-                               flush_queue(this, this->passive_tasks);
+                               flush_queue(this, TASK_QUEUE_PASSIVE);
                                break;
                        case FAILED:
                        default:
@@ -947,7 +960,7 @@ static status_t process_response(private_task_manager_t *this,
                                /* processed, but task needs another exchange */
                                continue;
                        case ALREADY_DONE:
-                               flush_queue(this, this->active_tasks);
+                               flush_queue(this, TASK_QUEUE_ACTIVE);
                                break;
                        case FAILED:
                        default:
@@ -1542,6 +1555,7 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
                                .adopt_tasks = _adopt_tasks,
                                .busy = _busy,
                                .create_task_enumerator = _create_task_enumerator,
+                               .flush_queue = _flush_queue,
                                .destroy = _destroy,
                        },
                },

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 5cca529e07fdb376159cf37cfba2438a75cbdb6c..81367d21c8156b33c53124756644e503dde21d02 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -157,20 +157,40 @@ struct private_task_manager_t {
        double retransmit_base;
 };
 
+METHOD(task_manager_t, flush_queue, void,
+       private_task_manager_t *this, task_queue_t queue)
+{
+       linked_list_t *list;
+       task_t *task;
+
+       switch (queue)
+       {
+               case TASK_QUEUE_ACTIVE:
+                       list = this->active_tasks;
+                       break;
+               case TASK_QUEUE_PASSIVE:
+                       list = this->passive_tasks;
+                       break;
+               case TASK_QUEUE_QUEUED:
+                       list = this->queued_tasks;
+                       break;
+               default:
+                       return;
+       }
+       while (list->remove_last(list, (void**)&task) == SUCCESS)
+       {
+               task->destroy(task);
+       }
+}
+
 /**
  * flush all tasks in the task manager
  */
 static void flush(private_task_manager_t *this)
 {
-       this->passive_tasks->destroy_offset(this->passive_tasks,
-                                                                               offsetof(task_t, destroy));
-       this->passive_tasks = linked_list_create();
-       this->active_tasks->destroy_offset(this->active_tasks,
-                                                                               offsetof(task_t, destroy));
-       this->active_tasks = linked_list_create();
-       this->queued_tasks->destroy_offset(this->queued_tasks,
-                                                                               offsetof(task_t, destroy));
-       this->queued_tasks = linked_list_create();
+       flush_queue(this, TASK_QUEUE_QUEUED);
+       flush_queue(this, TASK_QUEUE_PASSIVE);
+       flush_queue(this, TASK_QUEUE_ACTIVE);
 }
 
 /**
@@ -1465,6 +1485,7 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
                                .adopt_tasks = _adopt_tasks,
                                .busy = _busy,
                                .create_task_enumerator = _create_task_enumerator,
+                               .flush_queue = _flush_queue,
                                .destroy = _destroy,
                        },
                },

diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index cbebc0a21885a472aefad7e4b20bce7cffd0fcda..c649cf78eeb509386e2fda0d0a6104ded37e49b3 100644 (file)
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -253,6 +253,13 @@ struct task_manager_t {
        enumerator_t* (*create_task_enumerator)(task_manager_t *this,
                                                                                        task_queue_t queue);
 
+       /**
+        * Flush a queue, cancelling all tasks.
+        *
+        * @param queue                 queue to flush
+        */
+       void (*flush_queue)(task_manager_t *this, task_queue_t queue);
+
        /**
         * Destroy the task_manager_t.
         */