ike-rekey: Make sure to ignore task when detecting collisions if ike-init subtask...

For instance, if INVALID_KE_PAYLOAD is returned we don't want this task
to affect any active rekeying (no new SA has been established so far).

diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
index dadf872df0e08f53baacf79d00e77be0400c4ab1..44684bca6b387e45f999952f0e7e3e3413ad5ea0 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_rekey.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c
@@ -242,9 +242,10 @@ METHOD(task_t, build_r, status_t,
                message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty);
                return SUCCESS;
        }
-
        if (this->ike_init->task.build(&this->ike_init->task, message) == FAILED)
        {
+               this->ike_init->task.destroy(&this->ike_init->task);
+               this->ike_init = NULL;
                charon->bus->set_sa(charon->bus, this->ike_sa);
                return SUCCESS;
        }