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

Moved IKE_SA rekey task creation to protocol specific task manager

This commit is contained in:
Martin Willi 2011-12-19 14:35:14 +01:00
parent 3ed148b37e
commit dab60d6411
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1325,11 +1325,7 @@ METHOD(ike_sa_t, delete_, status_t,
METHOD(ike_sa_t, rekey, status_t,
private_ike_sa_t *this)
{
ike_rekey_t *ike_rekey;
ike_rekey = ike_rekey_create(&this->public, TRUE);
this->task_manager->queue_task(this->task_manager, &ike_rekey->task);
this->task_manager->queue_ike_rekey(this->task_manager);
return this->task_manager->initiate(this->task_manager);
}

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

@ -1023,6 +1023,12 @@ METHOD(task_manager_t, queue_ike, void,
queue_task(this, (task_t*)isakmp_natd_create(this->ike_sa, TRUE));
}
METHOD(task_manager_t, queue_ike_rekey, void,
private_task_manager_t *this)
{
/* TODO-IKEv1: IKE_SA rekeying */
}
METHOD(task_manager_t, queue_ike_delete, void,
private_task_manager_t *this)
{
@ -1132,6 +1138,7 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
.process_message = _process_message,
.queue_task = _queue_task,
.queue_ike = _queue_ike,
.queue_ike_rekey = _queue_ike_rekey,
.queue_ike_delete = _queue_ike_delete,
.queue_child = _queue_child,
.queue_child_rekey = _queue_child_rekey,

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

@ -1200,6 +1200,12 @@ METHOD(task_manager_t, queue_ike, void,
#endif /* ME */
}
METHOD(task_manager_t, queue_ike_rekey, void,
private_task_manager_t *this)
{
queue_task(this, (task_t*)ike_rekey_create(this->ike_sa, TRUE));
}
METHOD(task_manager_t, queue_ike_delete, void,
private_task_manager_t *this)
{
@ -1357,6 +1363,7 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
.process_message = _process_message,
.queue_task = _queue_task,
.queue_ike = _queue_ike,
.queue_ike_rekey = _queue_ike_rekey,
.queue_ike_delete = _queue_ike_delete,
.queue_child = _queue_child,
.queue_child_rekey = _queue_child_rekey,

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

@ -129,6 +129,11 @@ struct task_manager_t {
*/
void (*queue_ike)(task_manager_t *this);
/**
* Queue IKE_SA rekey tasks.
*/
void (*queue_ike_rekey)(task_manager_t *this);
/**
* Queue IKE_SA delete tasks.
*/