aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/plugins/ha/ha_dispatcher.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-08-24 12:31:24 +0000
committerMartin Willi <martin@revosec.ch>2012-08-30 16:43:42 +0200
commit497ce2cf51d3e80302e24e5bdf7df566d80b4828 (patch)
tree311e91603cae7981db1ace7009a0e880cb87eed5 /src/libcharon/plugins/ha/ha_dispatcher.c
parent101d26babeae0a6444bf7a355cbd3fb2e7497fae (diff)
downloadstrongswan-497ce2cf51d3e80302e24e5bdf7df566d80b4828.tar.bz2
strongswan-497ce2cf51d3e80302e24e5bdf7df566d80b4828.tar.xz
Support multiple address pools configured on a peer_cfg
Diffstat (limited to 'src/libcharon/plugins/ha/ha_dispatcher.c')
-rw-r--r--src/libcharon/plugins/ha/ha_dispatcher.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 8516f4f3e..f07b4ea21 100644
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -413,23 +413,24 @@ static void process_ike_update(private_ha_dispatcher_t *this,
}
if (received_vip)
{
+ enumerator_t *pools, *vips;
host_t *vip;
char *pool;
peer_cfg = ike_sa->get_peer_cfg(ike_sa);
if (peer_cfg)
{
- pool = peer_cfg->get_pool(peer_cfg);
- if (pool)
+ pools = peer_cfg->create_pool_enumerator(peer_cfg);
+ while (pools->enumerate(pools, &pool))
{
- enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa,
- FALSE);
- while (enumerator->enumerate(enumerator, &vip))
+ vips = ike_sa->create_virtual_ip_enumerator(ike_sa, FALSE);
+ while (vips->enumerate(vips, &vip))
{
this->attr->reserve(this->attr, pool, vip);
}
- enumerator->destroy(enumerator);
+ vips->destroy(vips);
}
+ pools->destroy(pools);
}
}
if (ike_sa->get_version(ike_sa) == IKEV1)