From 09711198a7cc90a932e110b20ef587682c1bd01f Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 1 Jun 2016 15:45:01 +0200 Subject: [PATCH] ike-rekey: Make sure to ignore task when detecting collisions if ike-init subtask failed 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). --- src/libcharon/sa/ikev2/tasks/ike_rekey.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c index dadf872df0..44684bca6b 100644 --- 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; } -- 2.47.2