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

Make sure we propose a dynamic TS if we don't have hosts to derive a TS from

Browse Source 
7ee37114 removed this behavior.
This commit is contained in:
Tobias Brunner
2012-09-21 18:14:17 +02:00
parent 0d33f428d1
commit 6676769e8c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/config/child_cfg.c
+8 -10
View File
@@ -258,19 +258,17 @@ METHOD(child_cfg_t, get_traffic_selectors, linked_list_t*,
/* In a first step, replace "dynamic" TS with the host list */
while (e1->enumerate(e1, &ts1))
{
if (ts1->is_dynamic(ts1))
if (hosts && hosts->get_count(hosts) &&
ts1->is_dynamic(ts1))
{
if (hosts)
e2 = hosts->create_enumerator(hosts);
while (e2->enumerate(e2, &host))
{
e2 = hosts->create_enumerator(hosts);
while (e2->enumerate(e2, &host))
{
ts2 = ts1->clone(ts1);
ts2->set_address(ts2, host);
result->insert_last(derived, ts2);
}
e2->destroy(e2);
ts2 = ts1->clone(ts1);
ts2->set_address(ts2, host);
derived->insert_last(derived, ts2);
}
e2->destroy(e2);
}
else
{