From: Martin Willi <martin@revosec.ch>
Date: Fri, 29 Jun 2012 11:40:05 +0000 (+0200)
Subject: As a responder, don't start a TRANSACTION request if we expect one from the initiator
X-Git-Tag: 5.0.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d2968e2729b8e9d97a1109c85088714641696b9;p=thirdparty%2Fstrongswan.git

As a responder, don't start a TRANSACTION request if we expect one from the initiator
---

diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c
index ec3154846b..9b5ad18b4a 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 fc487e1e95..5392869385 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));