From: Martin Willi <martin@revosec.ch>
Date: Tue, 26 Jun 2012 08:35:24 +0000 (+0200)
Subject: Queue a mode config task as responder if we need a virtual IP
X-Git-Tag: 5.0.0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ff45cfd99569b46cecf5f04b036570be3bafb2c;p=thirdparty%2Fstrongswan.git

Queue a mode config task as responder if we need a virtual IP
---

diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c
index d6ed9aa845..ec3154846b 100644
--- a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c
@@ -478,7 +478,7 @@ METHOD(task_t, process_r, status_t,
 				case AUTH_XAUTH_RESP_RSA:
 				case AUTH_HYBRID_RESP_RSA:
 					/* wait for XAUTH request */
-					return SUCCESS;
+					break;
 				default:
 					if (charon->ike_sa_manager->check_uniqueness(
 								charon->ike_sa_manager, this->ike_sa, FALSE))
@@ -494,8 +494,14 @@ METHOD(task_t, process_r, status_t,
 					lib->processor->queue_job(lib->processor, (job_t*)
 									adopt_children_job_create(
 										this->ike_sa->get_id(this->ike_sa)));
-					return SUCCESS;
+					break;
+			}
+			if (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));
 			}
+			return SUCCESS;
 		}
 		default:
 			return FAILED;
diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
index a65b3a68b7..fc487e1e95 100644
--- a/src/libcharon/sa/ikev1/tasks/main_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
@@ -506,7 +506,7 @@ METHOD(task_t, build_r, status_t,
 				case AUTH_XAUTH_RESP_RSA:
 				case AUTH_HYBRID_RESP_RSA:
 					/* wait for XAUTH request */
-					return SUCCESS;
+					break;
 				default:
 					if (charon->ike_sa_manager->check_uniqueness(
 								charon->ike_sa_manager, this->ike_sa, FALSE))
@@ -522,8 +522,14 @@ METHOD(task_t, build_r, status_t,
 					lib->processor->queue_job(lib->processor, (job_t*)
 									adopt_children_job_create(
 										this->ike_sa->get_id(this->ike_sa)));
-					return SUCCESS;
+					break;
+			}
+			if (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));
 			}
+			return SUCCESS;
 		}
 		default:
 			return FAILED;