diff options
Diffstat (limited to 'src/libcharon/processing/jobs/acquire_job.c')
| -rw-r--r-- | src/libcharon/processing/jobs/acquire_job.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/libcharon/processing/jobs/acquire_job.c b/src/libcharon/processing/jobs/acquire_job.c index 7a38d2553..3544dd332 100644 --- a/src/libcharon/processing/jobs/acquire_job.c +++ b/src/libcharon/processing/jobs/acquire_job.c @@ -45,30 +45,16 @@ struct private_acquire_job_t { traffic_selector_t *dst_ts; }; -<<<<<<< HEAD -/** - * Implementation of job_t.destroy. - */ -static void destroy(private_acquire_job_t *this) -======= METHOD(job_t, destroy, void, private_acquire_job_t *this) ->>>>>>> upstream/4.5.1 { DESTROY_IF(this->src_ts); DESTROY_IF(this->dst_ts); free(this); } -<<<<<<< HEAD -/** - * Implementation of job_t.execute. - */ -static void execute(private_acquire_job_t *this) -======= METHOD(job_t, execute, void, private_acquire_job_t *this) ->>>>>>> upstream/4.5.1 { charon->traps->acquire(charon->traps, this->reqid, this->src_ts, this->dst_ts); @@ -82,16 +68,6 @@ acquire_job_t *acquire_job_create(u_int32_t reqid, traffic_selector_t *src_ts, traffic_selector_t *dst_ts) { -<<<<<<< HEAD - private_acquire_job_t *this = malloc_thing(private_acquire_job_t); - - this->public.job_interface.execute = (void (*) (job_t *)) execute; - this->public.job_interface.destroy = (void (*)(job_t*)) destroy; - - this->reqid = reqid; - this->src_ts = src_ts; - this->dst_ts = dst_ts; -======= private_acquire_job_t *this; INIT(this, @@ -105,7 +81,6 @@ acquire_job_t *acquire_job_create(u_int32_t reqid, .src_ts = src_ts, .dst_ts = dst_ts, ); ->>>>>>> upstream/4.5.1 return &this->public; } |