aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-01-03 11:57:35 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:31:32 +0100
commit54773729a88196dfa394fa8ca4639318f99c43eb (patch)
tree006195f1b568400d1a399a0ca9f8dcda0ffcc1b1 /src
parentd71092ceed514b312b4bbd2a1b9e2300e256d1f7 (diff)
downloadstrongswan-54773729a88196dfa394fa8ca4639318f99c43eb.tar.bz2
strongswan-54773729a88196dfa394fa8ca4639318f99c43eb.tar.xz
Queue Mode Config tasks after main mode as initiator, not as responder
Diffstat (limited to 'src')
-rw-r--r--src/libcharon/sa/ikev1/tasks/main_mode.c12
1 files 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: