From: Martin Willi <martin@revosec.ch>
Date: Tue, 3 Jan 2012 10:57:35 +0000 (+0100)
Subject: Queue Mode Config tasks after main mode as initiator, not as responder
X-Git-Tag: 5.0.0~338^2~9^2~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54773729a88196dfa394fa8ca4639318f99c43eb;p=thirdparty%2Fstrongswan.git

Queue Mode Config tasks after main mode as initiator, not as responder
---

diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c
index cd790787fe..a9486e8399 100644
--- a/src/libcharon/sa/ikev1/tasks/main_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/main_mode.c
@@ -950,12 +950,6 @@ METHOD(task_t, build_r, status_t,
 			authenticator->destroy(authenticator);
 			save_auth_cfg(this, TRUE);
 
-			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));
-			}
-
 			switch (this->auth_method)
 			{
 				case AUTH_XAUTH_INIT_PSK:
@@ -1072,6 +1066,12 @@ METHOD(task_t, process_i, status_t,
 			}
 			save_auth_cfg(this, FALSE);
 
+			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));
+			}
+
 			switch (this->auth_method)
 			{
 				case AUTH_XAUTH_INIT_PSK: