diff options
| author | Martin Willi <martin@revosec.ch> | 2012-08-31 12:55:56 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-08-31 12:55:56 +0200 |
| commit | 1323dc1138246a6e2819bcc20b167b75d52e6d7c (patch) | |
| tree | 5081fcc1d015a8cd0ec6dfe39a8df14f12d86ac5 /src/libcharon/plugins/ha/ha_attribute.c | |
| parent | 868409139b00f24607baab2d81b873cb1a5a9e5b (diff) | |
| parent | 69e056a2c13ac7da9ed4e48f846d642aa01a362b (diff) | |
| download | strongswan-1323dc1138246a6e2819bcc20b167b75d52e6d7c.tar.bz2 strongswan-1323dc1138246a6e2819bcc20b167b75d52e6d7c.tar.xz | |
Merge branch 'multi-vip'
Brings support for multiple virtual IPs and multiple pools in
left/rigthsourceip definitions. Also introduces the new left/rightdns
options to configure requested DNS server address family and respond
with multiple connection specific servers.
Diffstat (limited to 'src/libcharon/plugins/ha/ha_attribute.c')
| -rw-r--r-- | src/libcharon/plugins/ha/ha_attribute.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libcharon/plugins/ha/ha_attribute.c b/src/libcharon/plugins/ha/ha_attribute.c index 64bd2b8b7..f18c58b6a 100644 --- a/src/libcharon/plugins/ha/ha_attribute.c +++ b/src/libcharon/plugins/ha/ha_attribute.c @@ -181,6 +181,12 @@ METHOD(attribute_provider_t, acquire_address, host_t*, pool = get_pool(this, name); if (pool) { + if (pool->base->get_family(pool->base) != + requested->get_family(requested)) + { + this->mutex->unlock(this->mutex); + return NULL; + } for (byte = 0; byte < pool->size / 8; byte++) { if (pool->mask[byte] != 0xFF) |