diff options
Diffstat (limited to 'src/libcharon/processing/jobs/update_sa_job.c')
| -rw-r--r-- | src/libcharon/processing/jobs/update_sa_job.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/libcharon/processing/jobs/update_sa_job.c b/src/libcharon/processing/jobs/update_sa_job.c index eeaf9f1c4..3b4e9949f 100644 --- a/src/libcharon/processing/jobs/update_sa_job.c +++ b/src/libcharon/processing/jobs/update_sa_job.c @@ -43,29 +43,15 @@ struct private_update_sa_job_t { host_t *new; }; -<<<<<<< HEAD -/** - * Implements job_t.destroy. - */ -static void destroy(private_update_sa_job_t *this) -======= METHOD(job_t, destroy, void, private_update_sa_job_t *this) ->>>>>>> upstream/4.5.1 { this->new->destroy(this->new); free(this); } -<<<<<<< HEAD -/** - * Implementation of job_t.execute. - */ -static void execute(private_update_sa_job_t *this) -======= METHOD(job_t, execute, void, private_update_sa_job_t *this) ->>>>>>> upstream/4.5.1 { ike_sa_t *ike_sa; @@ -81,11 +67,7 @@ METHOD(job_t, execute, void, if (ike_sa->has_condition(ike_sa, COND_NAT_THERE) && !ike_sa->has_condition(ike_sa, COND_NAT_HERE)) { -<<<<<<< HEAD - ike_sa->update_hosts(ike_sa, NULL, this->new); -======= ike_sa->update_hosts(ike_sa, NULL, this->new, FALSE); ->>>>>>> upstream/4.5.1 } charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa); } @@ -97,15 +79,6 @@ METHOD(job_t, execute, void, */ update_sa_job_t *update_sa_job_create(u_int32_t reqid, host_t *new) { -<<<<<<< HEAD - private_update_sa_job_t *this = malloc_thing(private_update_sa_job_t); - - this->public.job_interface.execute = (void (*) (job_t *)) execute; - this->public.job_interface.destroy = (void (*) (job_t *)) destroy; - - this->reqid = reqid; - this->new = new; -======= private_update_sa_job_t *this; INIT(this, @@ -118,7 +91,6 @@ update_sa_job_t *update_sa_job_create(u_int32_t reqid, host_t *new) .reqid = reqid, .new = new, ); ->>>>>>> upstream/4.5.1 return &this->public; } |