From 54773729a88196dfa394fa8ca4639318f99c43eb Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 3 Jan 2012 11:57:35 +0100 Subject: [PATCH] Queue Mode Config tasks after main mode as initiator, not as responder --- src/libcharon/sa/ikev1/tasks/main_mode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libcharon/sa/ikev1/tasks/main_mode.c b/src/libcharon/sa/ikev1/tasks/main_mode.c index cd790787f..a9486e839 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: