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 ec3154846b05bac2a458dc678a4752ff99bc2b0b..9b5ad18b4aa723ce66c2e70892feb06a3c576c31 100644 (file)
--- 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 fc487e1e95d33973b9468e952572741c1701e2a9..5392869385e9d60440f3d0c60f6e2ba1fc535c97 100644 (file)
--- 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));