version 1.1.1.1, 2020/06/03 09:46:45
|
version 1.1.1.2, 2021/03/17 00:20:09
|
Line 707 static status_t select_and_install(private_child_creat
|
Line 707 static status_t select_and_install(private_child_creat
|
} |
} |
} |
} |
|
|
|
this->child_sa->set_ipcomp(this->child_sa, this->ipcomp); |
|
this->child_sa->set_mode(this->child_sa, this->mode); |
|
this->child_sa->set_protocol(this->child_sa, |
|
this->proposal->get_protocol(this->proposal)); |
|
this->child_sa->set_state(this->child_sa, CHILD_INSTALLING); |
|
|
|
/* addresses might have changed since we originally sent the request, update |
|
* them before we configure any policies and install the SAs */ |
|
this->child_sa->update(this->child_sa, me, other, NULL, |
|
this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY)); |
|
|
this->child_sa->set_policies(this->child_sa, my_ts, other_ts); |
this->child_sa->set_policies(this->child_sa, my_ts, other_ts); |
if (!this->initiator) |
if (!this->initiator) |
{ |
{ |
Line 716 static status_t select_and_install(private_child_creat
|
Line 727 static status_t select_and_install(private_child_creat
|
offsetof(traffic_selector_t, destroy)); |
offsetof(traffic_selector_t, destroy)); |
} |
} |
|
|
this->child_sa->set_state(this->child_sa, CHILD_INSTALLING); |
|
this->child_sa->set_ipcomp(this->child_sa, this->ipcomp); |
|
this->child_sa->set_mode(this->child_sa, this->mode); |
|
this->child_sa->set_protocol(this->child_sa, |
|
this->proposal->get_protocol(this->proposal)); |
|
|
|
if (this->my_cpi == 0 || this->other_cpi == 0 || this->ipcomp == IPCOMP_NONE) |
if (this->my_cpi == 0 || this->other_cpi == 0 || this->ipcomp == IPCOMP_NONE) |
{ |
{ |
this->my_cpi = this->other_cpi = 0; |
this->my_cpi = this->other_cpi = 0; |
Line 1853 METHOD(task_t, migrate, void,
|
Line 1858 METHOD(task_t, migrate, void,
|
{ |
{ |
this->proposals->destroy_offset(this->proposals, offsetof(proposal_t, destroy)); |
this->proposals->destroy_offset(this->proposals, offsetof(proposal_t, destroy)); |
} |
} |
| if (!this->rekey && !this->retry) |
| { |
| this->dh_group = MODP_NONE; |
| } |
this->ike_sa = ike_sa; |
this->ike_sa = ike_sa; |
this->keymat = (keymat_v2_t*)ike_sa->get_keymat(ike_sa); |
this->keymat = (keymat_v2_t*)ike_sa->get_keymat(ike_sa); |
this->proposal = NULL; |
this->proposal = NULL; |