ikev1: Activate DELETE tasks before other tasks in state ESTABLISHED

Fixes #1410.

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 7aa2c646b5cc37434e97816ef2102d6d8a312940..96005d7366996a38c9b0a89073fd1b67ddee7448 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -514,26 +514,26 @@ METHOD(task_manager_t, initiate, status_t,
                                        new_mid = TRUE;
                                        break;
                                }
-                               if (!mode_config_expected(this) &&
-                                       activate_task(this, TASK_QUICK_MODE))
+                               if (activate_task(this, TASK_ISAKMP_DELETE))
                                {
-                                       exchange = QUICK_MODE;
+                                       exchange = INFORMATIONAL_V1;
                                        new_mid = TRUE;
                                        break;
                                }
-                               if (activate_task(this, TASK_INFORMATIONAL))
+                               if (activate_task(this, TASK_QUICK_DELETE))
                                {
                                        exchange = INFORMATIONAL_V1;
                                        new_mid = TRUE;
                                        break;
                                }
-                               if (activate_task(this, TASK_QUICK_DELETE))
+                               if (!mode_config_expected(this) &&
+                                       activate_task(this, TASK_QUICK_MODE))
                                {
-                                       exchange = INFORMATIONAL_V1;
+                                       exchange = QUICK_MODE;
                                        new_mid = TRUE;
                                        break;
                                }
-                               if (activate_task(this, TASK_ISAKMP_DELETE))
+                               if (activate_task(this, TASK_INFORMATIONAL))
                                {
                                        exchange = INFORMATIONAL_V1;
                                        new_mid = TRUE;