From c6da59f014ff402256c1a931d44d0b144ebc0177 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 9 May 2012 15:28:29 +0200 Subject: [PATCH] Don't queue delete_ike_sa job when setting IKE_DELETING. This avoids deleting IKE_SAs during reauthentication (without trying to reestablish them). --- src/libcharon/sa/ike_sa.c | 8 -------- src/libcharon/sa/ikev2/tasks/ike_delete.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index fc69ecb223..926e2d14cc 100644 --- a/src/libcharon/sa/ike_sa.c +++ b/src/libcharon/sa/ike_sa.c @@ -678,14 +678,6 @@ METHOD(ike_sa_t, set_state, void, } break; } - case IKE_DELETING: - { - /* delete may fail if a packet gets lost, so set a timeout */ - job_t *job = (job_t*)delete_ike_sa_job_create(this->ike_sa_id, TRUE); - lib->scheduler->schedule_job(lib->scheduler, job, - HALF_OPEN_IKE_SA_TIMEOUT); - break; - } default: break; } diff --git a/src/libcharon/sa/ikev2/tasks/ike_delete.c b/src/libcharon/sa/ikev2/tasks/ike_delete.c index 29ac87258a..f127b0c150 100644 --- a/src/libcharon/sa/ikev2/tasks/ike_delete.c +++ b/src/libcharon/sa/ikev2/tasks/ike_delete.c @@ -135,7 +135,7 @@ METHOD(task_t, build_r, status_t, if (this->simultaneous) { - /* wait for peer's response for our delete request, but set a timeout */ + /* wait for peer's response for our delete request */ return SUCCESS; } if (!this->rekeyed) -- 2.47.2