ikev2: Reorder task activation for established IKE SAs

We now prefer MOBIKE tasks over delete tasks then the rest.

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 834da8a04110916e61b2eeebbbcaf389a767a918..89bde41fb7910ba48568eb5b285c00eb40ec6ca9 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -382,39 +382,39 @@ METHOD(task_manager_t, initiate, status_t,
                                }
                                break;
                        case IKE_ESTABLISHED:
-                               if (activate_task(this, TASK_CHILD_CREATE))
+                               if (activate_task(this, TASK_IKE_MOBIKE))
                                {
-                                       exchange = CREATE_CHILD_SA;
+                                       exchange = INFORMATIONAL;
                                        break;
                                }
-                               if (activate_task(this, TASK_CHILD_DELETE))
+                               if (activate_task(this, TASK_IKE_DELETE))
                                {
                                        exchange = INFORMATIONAL;
                                        break;
                                }
-                               if (activate_task(this, TASK_CHILD_REKEY))
+                               if (activate_task(this, TASK_CHILD_DELETE))
                                {
-                                       exchange = CREATE_CHILD_SA;
+                                       exchange = INFORMATIONAL;
                                        break;
                                }
-                               if (activate_task(this, TASK_IKE_DELETE))
+                               if (activate_task(this, TASK_IKE_REAUTH))
                                {
                                        exchange = INFORMATIONAL;
                                        break;
                                }
-                               if (activate_task(this, TASK_IKE_REKEY))
+                               if (activate_task(this, TASK_CHILD_CREATE))
                                {
                                        exchange = CREATE_CHILD_SA;
                                        break;
                                }
-                               if (activate_task(this, TASK_IKE_REAUTH))
+                               if (activate_task(this, TASK_CHILD_REKEY))
                                {
-                                       exchange = INFORMATIONAL;
+                                       exchange = CREATE_CHILD_SA;
                                        break;
                                }
-                               if (activate_task(this, TASK_IKE_MOBIKE))
+                               if (activate_task(this, TASK_IKE_REKEY))
                                {
-                                       exchange = INFORMATIONAL;
+                                       exchange = CREATE_CHILD_SA;
                                        break;
                                }
                                if (activate_task(this, TASK_IKE_DPD))