From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 22 Sep 2022 14:04:52 +0000 (+0200)
Subject: ikev2: Make sure the child-create task runs after all IKE_SA specific tasks
X-Git-Tag: 5.9.8rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14243dcdb53020227c4ae3f211f16ca394a91939;p=thirdparty%2Fstrongswan.git

ikev2: Make sure the child-create task runs after all IKE_SA specific tasks
---

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index e2db835116..5ff708288e 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -552,9 +552,9 @@ METHOD(task_manager_t, initiate, status_t,
 					activate_task(this, TASK_IKE_ME);
 #endif /* ME */
 					activate_task(this, TASK_IKE_CONFIG);
-					activate_task(this, TASK_CHILD_CREATE);
 					activate_task(this, TASK_IKE_AUTH_LIFETIME);
 					activate_task(this, TASK_IKE_MOBIKE);
+					activate_task(this, TASK_CHILD_CREATE);
 				}
 				break;
 			case IKE_ESTABLISHED:
@@ -1151,13 +1151,13 @@ static status_t process_request(private_task_manager_t *this,
 #endif /* ME */
 				task = (task_t*)ike_config_create(this->ike_sa, FALSE);
 				array_insert(this->passive_tasks, ARRAY_TAIL, task);
-				task = (task_t*)child_create_create(this->ike_sa, NULL, FALSE,
-													NULL, NULL);
-				array_insert(this->passive_tasks, ARRAY_TAIL, task);
 				task = (task_t*)ike_auth_lifetime_create(this->ike_sa, FALSE);
 				array_insert(this->passive_tasks, ARRAY_TAIL, task);
 				task = (task_t*)ike_mobike_create(this->ike_sa, FALSE);
 				array_insert(this->passive_tasks, ARRAY_TAIL, task);
+				task = (task_t*)child_create_create(this->ike_sa, NULL, FALSE,
+													NULL, NULL);
+				array_insert(this->passive_tasks, ARRAY_TAIL, task);
 				break;
 			}
 			case CREATE_CHILD_SA: