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 cd790787fea822dadf50c65e8eb73ff61eda8e30..a9486e8399912c179f7fb5c2615d44f3f783c7ce 100644 (file)
--- 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: