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

ikev1: Activate DELETE tasks before other tasks in state ESTABLISHED

Browse Source 
Fixes #1410.
This commit is contained in:
Tobias Brunner
2016-05-06 15:35:16 +02:00
parent bf3bed1cc4
commit 612fe5410b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+9 -9
View File
@@ -514,14 +514,7 @@ METHOD(task_manager_t, initiate, status_t,
new_mid = TRUE; new_mid = TRUE;
break; break;
} }
if (!mode_config_expected(this) && if (activate_task(this, TASK_ISAKMP_DELETE))
activate_task(this, TASK_QUICK_MODE))
{
exchange = QUICK_MODE;
new_mid = TRUE;
break;
}
if (activate_task(this, TASK_INFORMATIONAL))
{ {
exchange = INFORMATIONAL_V1; exchange = INFORMATIONAL_V1;
new_mid = TRUE; new_mid = TRUE;
@@ -533,7 +526,14 @@ METHOD(task_manager_t, initiate, status_t,
new_mid = TRUE; new_mid = TRUE;
break; break;
} }
if (activate_task(this, TASK_ISAKMP_DELETE)) if (!mode_config_expected(this) &&
activate_task(this, TASK_QUICK_MODE))
{
exchange = QUICK_MODE;
new_mid = TRUE;
break;
}
if (activate_task(this, TASK_INFORMATIONAL))
{ {
exchange = INFORMATIONAL_V1; exchange = INFORMATIONAL_V1;
new_mid = TRUE; new_mid = TRUE;