sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-09 00:00:53 -04:00
Code Issues Projects Releases Wiki Activity

ikev1: Extend adopt_children_job by task queuing, executed after adoption

Browse Source
This commit is contained in:
Martin Willi 2014-07-07 10:36:35 +02:00
parent cd9bba508b
commit 898c8b12f9
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libcharon/processing/jobs/adopt_children_job.c
View File

@ -17,6 +17,7 @@
#include <daemon.h> #include <daemon.h>
#include <hydra.h> #include <hydra.h>
#include <collections/array.h>
typedef struct private_adopt_children_job_t private_adopt_children_job_t; typedef struct private_adopt_children_job_t private_adopt_children_job_t;
@ -34,11 +35,17 @@ struct private_adopt_children_job_t {
* IKE_SA id to adopt children from * IKE_SA id to adopt children from
*/ */
ike_sa_id_t *id; ike_sa_id_t *id;
/**
* Tasks queued for execution
*/
array_t *tasks;
}; };
METHOD(job_t, destroy, void, METHOD(job_t, destroy, void,
private_adopt_children_job_t *this) private_adopt_children_job_t *this)
{ {
array_destroy_offset(this->tasks, offsetof(task_t, destroy));
this->id->destroy(this->id); this->id->destroy(this->id);
free(this); free(this);
} }
@ -149,6 +156,32 @@ METHOD(job_t, execute, job_requeue_t,
} }
} }
children->destroy_offset(children, offsetof(child_sa_t, destroy)); children->destroy_offset(children, offsetof(child_sa_t, destroy));
if (array_count(this->tasks))
{
ike_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager,
this->id);
if (ike_sa)
{
task_t *task;
while (array_remove(this->tasks, ARRAY_HEAD, &task))
{
task->migrate(task, ike_sa);
ike_sa->queue_task(ike_sa, task);
}
if (ike_sa->initiate(ike_sa, NULL, 0, NULL, NULL) == DESTROY_ME)
{
charon->ike_sa_manager->checkin_and_destroy(
charon->ike_sa_manager, ike_sa);
}
else
{
charon->ike_sa_manager->checkin(charon->ike_sa_manager,
ike_sa);
}
}
}
} }
return JOB_REQUEUE_NONE; return JOB_REQUEUE_NONE;
} }
@ -159,6 +192,12 @@ METHOD(job_t, get_priority, job_priority_t,
return JOB_PRIO_HIGH; return JOB_PRIO_HIGH;
} }
METHOD(adopt_children_job_t, queue_task, void,
private_adopt_children_job_t *this, task_t *task)
{
array_insert_create(&this->tasks, ARRAY_TAIL, task);
}
/** /**
* See header * See header
*/ */
@ -173,6 +212,7 @@ adopt_children_job_t *adopt_children_job_create(ike_sa_id_t *id)
.get_priority = _get_priority, .get_priority = _get_priority,
.destroy = _destroy, .destroy = _destroy,
}, },
.queue_task = _queue_task,
}, },
.id = id->clone(id), .id = id->clone(id),
); );

8
src/libcharon/processing/jobs/adopt_children_job.h
View File

@ -24,6 +24,7 @@
#include <library.h> #include <library.h>
#include <processing/jobs/job.h> #include <processing/jobs/job.h>
#include <sa/ike_sa_id.h> #include <sa/ike_sa_id.h>
#include <sa/task.h>
typedef struct adopt_children_job_t adopt_children_job_t; typedef struct adopt_children_job_t adopt_children_job_t;
@ -36,6 +37,13 @@ struct adopt_children_job_t {
* Implements job_t. * Implements job_t.
*/ */
job_t job_interface; job_t job_interface;
/**
* Queue a job for execution after completing migration.
*
* @param task task to queue for execution
*/
void (*queue_task)(adopt_children_job_t *this, task_t *task);
}; };
/** /**