ike_sa_id_t *mediation_sa_id;
};
-/**
- * Implements job_t.destroy.
- */
-static void destroy(private_initiate_mediation_job_t *this)
+METHOD(job_t, destroy, void,
+ private_initiate_mediation_job_t *this)
{
DESTROY_IF(this->mediation_sa_id);
DESTROY_IF(this->mediated_sa_id);
return TRUE;
}
-/**
- * Implementation of job_t.execute.
- */
-static void initiate(private_initiate_mediation_job_t *this)
+METHOD(job_t, initiate, void,
+ private_initiate_mediation_job_t *this)
{
ike_sa_t *mediated_sa, *mediation_sa;
peer_cfg_t *mediated_cfg, *mediation_cfg;
destroy(this);
}
-/**
- * Implementation of job_t.execute.
- */
-static void reinitiate(private_initiate_mediation_job_t *this)
+METHOD(job_t, reinitiate, void,
+ private_initiate_mediation_job_t *this)
{
ike_sa_t *mediated_sa, *mediation_sa;
peer_cfg_t *mediated_cfg;
destroy(this);
}
-/**
- * Implementation of job_t.get_priority.
- */
-static job_priority_t get_priority(private_initiate_mediation_job_t *this)
+METHOD(job_t, get_priority, job_priority_t,
+ private_initiate_mediation_job_t *this)
{
return JOB_PRIO_MEDIUM;
}
*/
static private_initiate_mediation_job_t *initiate_mediation_job_create_empty()
{
- private_initiate_mediation_job_t *this = malloc_thing(private_initiate_mediation_job_t);
-
- /* interface functions */
- this->public.job_interface.get_priority = (job_priority_t (*) (job_t *)) get_priority;
- this->public.job_interface.destroy = (void (*) (job_t *)) destroy;
-
- /* private variables */
- this->mediation_sa_id = NULL;
- this->mediated_sa_id = NULL;
-
+ private_initiate_mediation_job_t *this;
+ INIT(this,
+ .public = {
+ .job_interface = {
+ .get_priority = _get_priority,
+ .destroy = _destroy,
+ },
+ },
+ );
return this;
}
{
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);
return &this->public;
{
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->mediated_sa_id = mediated_sa_id->clone(mediated_sa_id);