ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

ike_sa: Defer task manager destruction after child destruction 

This patch exports the task manager's flush to allow flushing of all
queues with one function call from ike_sa->destroy. It allows the
access of intact children during task destructoin (see git-commit
e44ebdcf) and allows the access of the task manager in
child_state_change hook.

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
This commit is contained in:
Thomas Egerer 2014-01-16 13:24:08 +01:00 committed by Martin Willi
parent 800b361e19
commit b190899473
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcharon/sa/ike_sa.c
View File

@ -2138,7 +2138,10 @@ METHOD(ike_sa_t, destroy, void,
charon->bus->set_sa(charon->bus, &this->public);
set_state(this, IKE_DESTROYING);
DESTROY_IF(this->task_manager);
if (this->task_manager)
{
this->task_manager->flush(this->task_manager);
}
/* remove attributes first, as we pass the IKE_SA to the handler */
while (array_remove(this->attributes, ARRAY_TAIL, &entry))
@ -2182,6 +2185,7 @@ METHOD(ike_sa_t, destroy, void,
charon->bus->set_sa(charon->bus, NULL);
array_destroy(this->child_sas);
DESTROY_IF(this->task_manager);
DESTROY_IF(this->keymat);
array_destroy(this->attributes);
array_destroy(this->my_vips);

7
src/libcharon/sa/ikev1/task_manager_v1.c
View File

@ -339,10 +339,8 @@ METHOD(task_manager_t, flush_queue, void,
}
}
/**
* flush all tasks in the task manager
*/
static void flush(private_task_manager_t *this)
METHOD(task_manager_t, flush, void,
private_task_manager_t *this)
{
flush_queue(this, TASK_QUEUE_QUEUED);
flush_queue(this, TASK_QUEUE_PASSIVE);
@ -2070,6 +2068,7 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
.adopt_child_tasks = _adopt_child_tasks,
.busy = _busy,
.create_task_enumerator = _create_task_enumerator,
.flush = _flush,
.flush_queue = _flush_queue,
.destroy = _destroy,
},

7
src/libcharon/sa/ikev2/task_manager_v2.c
View File

@ -184,10 +184,8 @@ METHOD(task_manager_t, flush_queue, void,
}
}
/**
* flush all tasks in the task manager
*/
static void flush(private_task_manager_t *this)
METHOD(task_manager_t, flush, void,
private_task_manager_t *this)
{
flush_queue(this, TASK_QUEUE_QUEUED);
flush_queue(this, TASK_QUEUE_PASSIVE);
@ -1569,6 +1567,7 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
.adopt_child_tasks = _adopt_child_tasks,
.busy = _busy,
.create_task_enumerator = _create_task_enumerator,
.flush = _flush,
.flush_queue = _flush_queue,
.destroy = _destroy,
},

5
src/libcharon/sa/task_manager.h
View File

@ -260,6 +260,11 @@ struct task_manager_t {
enumerator_t* (*create_task_enumerator)(task_manager_t *this,
task_queue_t queue);
/**
* Flush all tasks, regardless of the queue.
*/
void (*flush)(task_manager_t *this);
/**
* Flush a queue, cancelling all tasks.
*