denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated initiate_mediation_job_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-03 18:53:14 +02:00
parent 17a5861a6e
commit a36e175ade
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/processing/jobs/initiate_mediation_job.c
+19 -30
View File
@@ -41,10 +41,8 @@ struct private_initiate_mediation_job_t {
ike_sa_id_t *mediation_sa_id; ike_sa_id_t *mediation_sa_id;
}; };
/** METHOD(job_t, destroy, void,
* Implements job_t.destroy. private_initiate_mediation_job_t *this)
*/
static void destroy(private_initiate_mediation_job_t *this)
{ {
DESTROY_IF(this->mediation_sa_id); DESTROY_IF(this->mediation_sa_id);
DESTROY_IF(this->mediated_sa_id); DESTROY_IF(this->mediated_sa_id);
@@ -66,10 +64,8 @@ static bool initiate_callback(private_initiate_mediation_job_t *this,
return TRUE; return TRUE;
} }
/** METHOD(job_t, initiate, void,
* Implementation of job_t.execute. private_initiate_mediation_job_t *this)
*/
static void initiate(private_initiate_mediation_job_t *this)
{ {
ike_sa_t *mediated_sa, *mediation_sa; ike_sa_t *mediated_sa, *mediation_sa;
peer_cfg_t *mediated_cfg, *mediation_cfg; peer_cfg_t *mediated_cfg, *mediation_cfg;
@@ -172,10 +168,8 @@ static void initiate(private_initiate_mediation_job_t *this)
destroy(this); destroy(this);
} }
/** METHOD(job_t, reinitiate, void,
* Implementation of job_t.execute. private_initiate_mediation_job_t *this)
*/
static void reinitiate(private_initiate_mediation_job_t *this)
{ {
ike_sa_t *mediated_sa, *mediation_sa; ike_sa_t *mediated_sa, *mediation_sa;
peer_cfg_t *mediated_cfg; peer_cfg_t *mediated_cfg;
@@ -223,10 +217,8 @@ static void reinitiate(private_initiate_mediation_job_t *this)
destroy(this); destroy(this);
} }
/** METHOD(job_t, get_priority, job_priority_t,
* Implementation of job_t.get_priority. private_initiate_mediation_job_t *this)
*/
static job_priority_t get_priority(private_initiate_mediation_job_t *this)
{ {
return JOB_PRIO_MEDIUM; return JOB_PRIO_MEDIUM;
} }
@@ -236,16 +228,15 @@ static job_priority_t get_priority(private_initiate_mediation_job_t *this)
*/ */
static private_initiate_mediation_job_t *initiate_mediation_job_create_empty() static private_initiate_mediation_job_t *initiate_mediation_job_create_empty()
{ {
private_initiate_mediation_job_t *this = malloc_thing(private_initiate_mediation_job_t); private_initiate_mediation_job_t *this;
INIT(this,
/* interface functions */ .public = {
this->public.job_interface.get_priority = (job_priority_t (*) (job_t *)) get_priority; .job_interface = {
this->public.job_interface.destroy = (void (*) (job_t *)) destroy; .get_priority = _get_priority,
.destroy = _destroy,
/* private variables */ },
this->mediation_sa_id = NULL; },
this->mediated_sa_id = NULL; );
return this; return this;
} }
@@ -256,8 +247,7 @@ initiate_mediation_job_t *initiate_mediation_job_create(ike_sa_id_t *ike_sa_id)
{ {
private_initiate_mediation_job_t *this = initiate_mediation_job_create_empty(); private_initiate_mediation_job_t *this = initiate_mediation_job_create_empty();
this->public.job_interface.execute = (void (*) (job_t *)) initiate; this->public.job_interface.execute = _initiate;
this->mediated_sa_id = ike_sa_id->clone(ike_sa_id); this->mediated_sa_id = ike_sa_id->clone(ike_sa_id);
return &this->public; return &this->public;
@@ -271,8 +261,7 @@ initiate_mediation_job_t *reinitiate_mediation_job_create(ike_sa_id_t *mediation
{ {
private_initiate_mediation_job_t *this = initiate_mediation_job_create_empty(); private_initiate_mediation_job_t *this = initiate_mediation_job_create_empty();
this->public.job_interface.execute = (void (*) (job_t *)) reinitiate; this->public.job_interface.execute = _reinitiate;
this->mediation_sa_id = mediation_sa_id->clone(mediation_sa_id); this->mediation_sa_id = mediation_sa_id->clone(mediation_sa_id);
this->mediated_sa_id = mediated_sa_id->clone(mediated_sa_id); this->mediated_sa_id = mediated_sa_id->clone(mediated_sa_id);