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

Use traffic selectors passed to quick mode constructor as initiator

Browse Source
This commit is contained in:
Martin Willi
2012-06-08 10:22:03 +02:00
parent 1e24fa4614
commit d61f2906d4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+10 -2
View File
@@ -717,8 +717,14 @@ METHOD(task_t, build_i, status_t,
} }
add_ke(this, message); add_ke(this, message);
} }
this->tsi = select_ts(this, TRUE, NULL); if (!this->tsi)
this->tsr = select_ts(this, FALSE, NULL); {
this->tsi = select_ts(this, TRUE, NULL);
}
if (!this->tsr)
{
this->tsr = select_ts(this, FALSE, NULL);
}
tsi = linked_list_create(); tsi = linked_list_create();
tsr = linked_list_create(); tsr = linked_list_create();
tsi->insert_last(tsi, this->tsi); tsi->insert_last(tsi, this->tsi);
@@ -1186,6 +1192,8 @@ quick_mode_t *quick_mode_create(ike_sa_t *ike_sa, child_cfg_t *config,
.config = config, .config = config,
.keymat = (keymat_v1_t*)ike_sa->get_keymat(ike_sa), .keymat = (keymat_v1_t*)ike_sa->get_keymat(ike_sa),
.state = QM_INIT, .state = QM_INIT,
.tsi = tsi ? tsi->clone(tsi) : NULL,
.tsr = tsr ? tsr->clone(tsr) : NULL,
); );
if (config) if (config)