ikev2: Reorder task activation for established IKE SAs
We now prefer MOBIKE tasks over delete tasks then the rest.
This commit is contained in:
@@ -382,29 +382,19 @@ METHOD(task_manager_t, initiate, status_t,
|
||||
}
|
||||
break;
|
||||
case IKE_ESTABLISHED:
|
||||
if (activate_task(this, TASK_CHILD_CREATE))
|
||||
{
|
||||
exchange = CREATE_CHILD_SA;
|
||||
break;
|
||||
}
|
||||
if (activate_task(this, TASK_CHILD_DELETE))
|
||||
if (activate_task(this, TASK_IKE_MOBIKE))
|
||||
{
|
||||
exchange = INFORMATIONAL;
|
||||
break;
|
||||
}
|
||||
if (activate_task(this, TASK_CHILD_REKEY))
|
||||
{
|
||||
exchange = CREATE_CHILD_SA;
|
||||
break;
|
||||
}
|
||||
if (activate_task(this, TASK_IKE_DELETE))
|
||||
{
|
||||
exchange = INFORMATIONAL;
|
||||
break;
|
||||
}
|
||||
if (activate_task(this, TASK_IKE_REKEY))
|
||||
if (activate_task(this, TASK_CHILD_DELETE))
|
||||
{
|
||||
exchange = CREATE_CHILD_SA;
|
||||
exchange = INFORMATIONAL;
|
||||
break;
|
||||
}
|
||||
if (activate_task(this, TASK_IKE_REAUTH))
|
||||
@@ -412,9 +402,19 @@ METHOD(task_manager_t, initiate, status_t,
|
||||
exchange = INFORMATIONAL;
|
||||
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;
|
||||
}
|
||||
if (activate_task(this, TASK_IKE_DPD))
|
||||
|
||||
Reference in New Issue
Block a user