denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

child-sa: Pass default interface ID inherited from IKE_SA

Browse Source 
Also pass optional arguments as struct.
This commit is contained in:
Tobias Brunner
2019-04-04 09:36:38 +02:00
parent dec3c184a6
commit fafa76984d
6 changed files with 117 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/child_create.c
+24 -41
View File
@@ -169,29 +169,9 @@ struct private_child_create_t {
uint16_t other_cpi;
/**
* reqid to use if we are rekeying
* Data collected to create the CHILD_SA
*/
uint32_t reqid;
/**
* Explicit inbound mark value
*/
uint32_t mark_in;
/**
* Explicit outbound mark value
*/
uint32_t mark_out;
/**
* Explicit inbound interface ID to use, if any
*/
uint32_t if_id_in;
/**
* Explicit outbound interface ID to use, if any
*/
uint32_t if_id_out;
child_sa_create_t child;
/**
* CHILD_SA which gets established
@@ -227,7 +207,10 @@ static void schedule_delayed_retry(private_child_create_t *this)
task = child_create_create(this->ike_sa,
this->config->get_ref(this->config), FALSE,
this->packet_tsi, this->packet_tsr);
task->use_reqid(task, this->reqid);
task->use_reqid(task, this->child.reqid);
task->use_marks(task, this->child.mark_in, this->child.mark_out);
task->use_if_ids(task, this->child.if_id_in, this->child.if_id_out);
DBG1(DBG_IKE, "creating CHILD_SA failed, trying again in %d seconds",
retry);
this->ike_sa->queue_task_delayed(this->ike_sa, (task_t*)task, retry);
@@ -1117,16 +1100,18 @@ METHOD(task_t, build_i, status_t,
this->dh_group == MODP_NONE);
this->mode = this->config->get_mode(this->config);
this->child.if_id_in_def = this->ike_sa->get_if_id(this->ike_sa, TRUE);
this->child.if_id_out_def = this->ike_sa->get_if_id(this->ike_sa, FALSE);
this->child.encap = this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY);
this->child_sa = child_sa_create(this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa), this->config, this->reqid,
this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY),
this->mark_in, this->mark_out, this->if_id_in, this->if_id_out);
this->ike_sa->get_other_host(this->ike_sa),
this->config, &this->child);
if (this->reqid)
if (this->child.reqid)
{
DBG0(DBG_IKE, "establishing CHILD_SA %s{%d} reqid %d",
this->child_sa->get_name(this->child_sa),
this->child_sa->get_unique_id(this->child_sa), this->reqid);
this->child_sa->get_unique_id(this->child_sa), this->child.reqid);
}
else
{
@@ -1402,10 +1387,12 @@ METHOD(task_t, build_r, status_t,
}
enumerator->destroy(enumerator);
this->child.if_id_in_def = this->ike_sa->get_if_id(this->ike_sa, TRUE);
this->child.if_id_out_def = this->ike_sa->get_if_id(this->ike_sa, FALSE);
this->child.encap = this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY);
this->child_sa = child_sa_create(this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa), this->config, this->reqid,
this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY),
this->mark_in, this->mark_out, this->if_id_in, this->if_id_out);
this->ike_sa->get_other_host(this->ike_sa),
this->config, &this->child);
if (this->ipcomp_received != IPCOMP_NONE)
{
@@ -1670,21 +1657,21 @@ METHOD(task_t, process_i, status_t,
METHOD(child_create_t, use_reqid, void,
private_child_create_t *this, uint32_t reqid)
{
this->reqid = reqid;
this->child.reqid = reqid;
}
METHOD(child_create_t, use_marks, void,
private_child_create_t *this, uint32_t in, uint32_t out)
{
this->mark_in = in;
this->mark_out = out;
this->child.mark_in = in;
this->child.mark_out = out;
}
METHOD(child_create_t, use_if_ids, void,
private_child_create_t *this, uint32_t in, uint32_t out)
{
this->if_id_in = in;
this->if_id_out = out;
this->child.if_id_in = in;
this->child.if_id_out = out;
}
METHOD(child_create_t, use_dh_group, void,
@@ -1762,12 +1749,8 @@ METHOD(task_t, migrate, void,
this->ipcomp = IPCOMP_NONE;
this->ipcomp_received = IPCOMP_NONE;
this->other_cpi = 0;
this->reqid = 0;
this->mark_in = 0;
this->mark_out = 0;
this->if_id_in = 0;
this->if_id_out = 0;
this->established = FALSE;
this->child = (child_sa_create_t){};
}
METHOD(task_t, destroy, void,