diff options
Diffstat (limited to 'src/libcharon/processing/jobs/send_dpd_job.c')
| -rw-r--r-- | src/libcharon/processing/jobs/send_dpd_job.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/libcharon/processing/jobs/send_dpd_job.c b/src/libcharon/processing/jobs/send_dpd_job.c index 1c2da52b8..0a0fd2144 100644 --- a/src/libcharon/processing/jobs/send_dpd_job.c +++ b/src/libcharon/processing/jobs/send_dpd_job.c @@ -38,19 +38,29 @@ struct private_send_dpd_job_t { ike_sa_id_t *ike_sa_id; }; +<<<<<<< HEAD /** * Implements job_t.destroy. */ static void destroy(private_send_dpd_job_t *this) +======= +METHOD(job_t, destroy, void, + private_send_dpd_job_t *this) +>>>>>>> upstream/4.5.1 { this->ike_sa_id->destroy(this->ike_sa_id); free(this); } +<<<<<<< HEAD /** * Implementation of job_t.execute. */ static void execute(private_send_dpd_job_t *this) +======= +METHOD(job_t, execute, void, + private_send_dpd_job_t *this) +>>>>>>> upstream/4.5.1 { ike_sa_t *ike_sa; @@ -75,6 +85,7 @@ static void execute(private_send_dpd_job_t *this) */ send_dpd_job_t *send_dpd_job_create(ike_sa_id_t *ike_sa_id) { +<<<<<<< HEAD private_send_dpd_job_t *this = malloc_thing(private_send_dpd_job_t); /* interface functions */ @@ -83,6 +94,19 @@ send_dpd_job_t *send_dpd_job_create(ike_sa_id_t *ike_sa_id) /* private variables */ this->ike_sa_id = ike_sa_id->clone(ike_sa_id); +======= + private_send_dpd_job_t *this; + + INIT(this, + .public = { + .job_interface = { + .execute = _execute, + .destroy = _destroy, + }, + }, + .ike_sa_id = ike_sa_id->clone(ike_sa_id), + ); +>>>>>>> upstream/4.5.1 return &this->public; } |