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

kernel: Restore enumeration of all addresses when searching for address in TS

Browse Source 
Since f52cf07532 addresses on ignored, down or loopback interfaces were
not considered as valid addresses anymore when searching for an address
contained in the local traffic selector.  This meant that route
installation failed, for instance, if charon.install_virtual_ip_on was
set to 'lo', or, on gateways, if internal interfaces were ignored with
the charon.interfaces_* options.
This commit is contained in:
Tobias Brunner
2013-08-21 17:01:03 +02:00
parent 85ca2f7441
commit d7ae0b254d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/kernel/kernel_interface.c
+6 -3
View File
@@ -447,7 +447,9 @@ METHOD(kernel_interface_t, get_address_by_ts, status_t,
}
host->destroy(host);
addrs = create_address_enumerator(this, ADDR_TYPE_VIRTUAL);
/* try virtual IPs only first (on all interfaces) */
addrs = create_address_enumerator(this,
ADDR_TYPE_ALL ^ ADDR_TYPE_REGULAR);
while (addrs->enumerate(addrs, (void**)&host))
{
if (ts->includes(ts, host))
@@ -464,8 +466,9 @@ METHOD(kernel_interface_t, get_address_by_ts, status_t,
addrs->destroy(addrs);
if (!found)
{
addrs = create_address_enumerator(this, ADDR_TYPE_REGULAR);
{ /* then try the regular addresses (on all interfaces) */
addrs = create_address_enumerator(this,
ADDR_TYPE_ALL ^ ADDR_TYPE_VIRTUAL);
while (addrs->enumerate(addrs, (void**)&host))
{
if (ts->includes(ts, host))