ikev2: Reorder task activation for established IKE SAs

We now prefer MOBIKE tasks over delete tasks then the rest.
This commit is contained in:
Tobias Brunner
2014-09-25 10:16:45 +02:00
parent b3a7ba14f1
commit 9e3ab0d114
+15 -15
View File
@@ -382,29 +382,19 @@ METHOD(task_manager_t, initiate, status_t,
} }
break; break;
case IKE_ESTABLISHED: case IKE_ESTABLISHED:
if (activate_task(this, TASK_CHILD_CREATE)) if (activate_task(this, TASK_IKE_MOBIKE))
{
exchange = CREATE_CHILD_SA;
break;
}
if (activate_task(this, TASK_CHILD_DELETE))
{ {
exchange = INFORMATIONAL; exchange = INFORMATIONAL;
break; break;
} }
if (activate_task(this, TASK_CHILD_REKEY))
{
exchange = CREATE_CHILD_SA;
break;
}
if (activate_task(this, TASK_IKE_DELETE)) if (activate_task(this, TASK_IKE_DELETE))
{ {
exchange = INFORMATIONAL; exchange = INFORMATIONAL;
break; break;
} }
if (activate_task(this, TASK_IKE_REKEY)) if (activate_task(this, TASK_CHILD_DELETE))
{ {
exchange = CREATE_CHILD_SA; exchange = INFORMATIONAL;
break; break;
} }
if (activate_task(this, TASK_IKE_REAUTH)) if (activate_task(this, TASK_IKE_REAUTH))
@@ -412,9 +402,19 @@ METHOD(task_manager_t, initiate, status_t,
exchange = INFORMATIONAL; exchange = INFORMATIONAL;
break; break;
} }
if (activate_task(this, TASK_IKE_MOBIKE)) if (activate_task(this, TASK_CHILD_CREATE))
{ {
exchange = INFORMATIONAL; exchange = CREATE_CHILD_SA;
break;
}
if (activate_task(this, TASK_CHILD_REKEY))
{
exchange = CREATE_CHILD_SA;
break;
}
if (activate_task(this, TASK_IKE_REKEY))
{
exchange = CREATE_CHILD_SA;
break; break;
} }
if (activate_task(this, TASK_IKE_DPD)) if (activate_task(this, TASK_IKE_DPD))