child-sa: Introduce a CHILD_RETRYING state to detect DH group retries

diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
index a96ab4e907043fc73380a80017c88ec02ae03a48..66be5fe619eafbfb126ed946e9ef45915372e715 100644 (file)
--- a/src/libcharon/sa/child_sa.c
+++ b/src/libcharon/sa/child_sa.c
@@ -34,6 +34,7 @@ ENUM(child_sa_state_names, CHILD_CREATED, CHILD_DESTROYING,
        "INSTALLED",
        "UPDATING",
        "REKEYING",
+       "RETRYING",
        "DELETING",
        "DESTROYING",
 );

diff --git a/src/libcharon/sa/child_sa.h b/src/libcharon/sa/child_sa.h
index a0c6c357f8ed7219d9bf68846d8f2843df9fea5b..30a0edf4214aed65bb4a4fb9d55d684970e63655 100644 (file)
--- a/src/libcharon/sa/child_sa.h
+++ b/src/libcharon/sa/child_sa.h
@@ -67,6 +67,11 @@ enum child_sa_state_t {
         */
        CHILD_REKEYING,
 
+       /**
+        * CHILD_SA negotiation failed, but gets retried
+        */
+       CHILD_RETRYING,
+
        /**
         * CHILD_SA in progress of delete
         */

diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index a1f01c276fa36de4986a50f1ecfacfa5d5fe63a0..e7a9148757fdaf7364b555b6ce7374702c1931b1 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -1408,6 +1408,7 @@ METHOD(task_t, process_i, status_t,
                                                 this->dh_group, diffie_hellman_group_names, group);
                                        this->retry = TRUE;
                                        this->dh_group = group;
+                                       this->child_sa->set_state(this->child_sa, CHILD_RETRYING);
                                        this->public.task.migrate(&this->public.task, this->ike_sa);
                                        enumerator->destroy(enumerator);
                                        return NEED_MORE;