denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Brunner
2022-09-22 17:42:22 +02:00
parent f3da04c05e
commit 14243dcdb5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/task_manager_v2.c
+4 -4
View File
@@ -552,9 +552,9 @@ METHOD(task_manager_t, initiate, status_t,
activate_task(this, TASK_IKE_ME); activate_task(this, TASK_IKE_ME);
#endif /* ME */ #endif /* ME */
activate_task(this, TASK_IKE_CONFIG); activate_task(this, TASK_IKE_CONFIG);
activate_task(this, TASK_CHILD_CREATE);
activate_task(this, TASK_IKE_AUTH_LIFETIME); activate_task(this, TASK_IKE_AUTH_LIFETIME);
activate_task(this, TASK_IKE_MOBIKE); activate_task(this, TASK_IKE_MOBIKE);
activate_task(this, TASK_CHILD_CREATE);
} }
break; break;
case IKE_ESTABLISHED: case IKE_ESTABLISHED:
@@ -1151,13 +1151,13 @@ static status_t process_request(private_task_manager_t *this,
#endif /* ME */ #endif /* ME */
task = (task_t*)ike_config_create(this->ike_sa, FALSE); task = (task_t*)ike_config_create(this->ike_sa, FALSE);
array_insert(this->passive_tasks, ARRAY_TAIL, task); 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); task = (task_t*)ike_auth_lifetime_create(this->ike_sa, FALSE);
array_insert(this->passive_tasks, ARRAY_TAIL, task); array_insert(this->passive_tasks, ARRAY_TAIL, task);
task = (task_t*)ike_mobike_create(this->ike_sa, FALSE); task = (task_t*)ike_mobike_create(this->ike_sa, FALSE);
array_insert(this->passive_tasks, ARRAY_TAIL, task); 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; break;
} }
case CREATE_CHILD_SA: case CREATE_CHILD_SA: