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/sa/ikev1/tasks/main_mode.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/sa/ikev1/tasks/main_mode.c')
| -rw-r--r-- | src/libcharon/sa/ikev1/tasks/main_mode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c index 539286938..9ccf9abf5 100644 --- a/src/libcharon/sa/ikev1/tasks/main_mode.c +++ b/src/libcharon/sa/ikev1/tasks/main_mode.c @@ -524,8 +524,8 @@ METHOD(task_t, build_r, status_t, this->ike_sa->get_id(this->ike_sa))); break; } - if (this->peer_cfg->get_pool(this->peer_cfg) == NULL && - this->peer_cfg->get_virtual_ip(this->peer_cfg)) + if (!this->ph1->has_pool(this->ph1, this->peer_cfg) && + this->ph1->has_virtual_ip(this->ph1, this->peer_cfg)) { this->ike_sa->queue_task(this->ike_sa, (task_t*)mode_config_create(this->ike_sa, TRUE)); @@ -658,7 +658,7 @@ METHOD(task_t, process_i, status_t, } break; } - if (this->peer_cfg->get_virtual_ip(this->peer_cfg)) + if (this->ph1->has_virtual_ip(this->ph1, this->peer_cfg)) { this->ike_sa->queue_task(this->ike_sa, (task_t*)mode_config_create(this->ike_sa, TRUE)); |