From 9d2968e2729b8e9d97a1109c85088714641696b9 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 29 Jun 2012 13:40:05 +0200 Subject: [PATCH] As a responder, don't start a TRANSACTION request if we expect one from the initiator --- src/libcharon/sa/ikev1/tasks/aggressive_mode.c | 3 ++- src/libcharon/sa/ikev1/tasks/main_mode.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c index ec3154846..9b5ad18b4 100644 --- a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c +++ b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c @@ -496,7 +496,8 @@ METHOD(task_t, process_r, status_t, this->ike_sa->get_id(this->ike_sa))); break; } - if (this->peer_cfg->get_virtual_ip(this->peer_cfg)) + if (this->peer_cfg->get_pool(this->peer_cfg) == NULL && + this->peer_cfg->get_virtual_ip(this->peer_cfg)) { this->ike_sa->queue_task(this->ike_sa, (task_t*)mode_config_create(this->ike_sa, TRUE)); diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c index fc487e1e9..539286938 100644 --- a/src/libcharon/sa/ikev1/tasks/main_mode.c +++ b/src/libcharon/sa/ikev1/tasks/main_mode.c @@ -524,7 +524,8 @@ METHOD(task_t, build_r, status_t, this->ike_sa->get_id(this->ike_sa))); break; } - if (this->peer_cfg->get_virtual_ip(this->peer_cfg)) + if (this->peer_cfg->get_pool(this->peer_cfg) == NULL && + this->peer_cfg->get_virtual_ip(this->peer_cfg)) { this->ike_sa->queue_task(this->ike_sa, (task_t*)mode_config_create(this->ike_sa, TRUE));