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

Check if a config has been selected before narrowing selectors in quick mode

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:28 +01:00
parent 85fc1eb640
commit 28e3c6595d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+5 -2
View File
@@ -697,8 +697,11 @@ METHOD(task_t, process_r, status_t,
this->tsi = this->tsr = NULL; this->tsi = this->tsr = NULL;
this->config = peer_cfg->select_child_cfg(peer_cfg, tsr, tsi, this->config = peer_cfg->select_child_cfg(peer_cfg, tsr, tsi,
me, other); me, other);
this->tsi = select_ts(this, FALSE, tsi); if (this->config)
this->tsr = select_ts(this, TRUE, tsr); {
this->tsi = select_ts(this, FALSE, tsi);
this->tsr = select_ts(this, TRUE, tsr);
}
tsi->destroy_offset(tsi, offsetof(traffic_selector_t, destroy)); tsi->destroy_offset(tsi, offsetof(traffic_selector_t, destroy));
tsr->destroy_offset(tsr, offsetof(traffic_selector_t, destroy)); tsr->destroy_offset(tsr, offsetof(traffic_selector_t, destroy));
if (!this->config) if (!this->config)