diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-05-09 15:28:29 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-05-25 17:05:53 +0200 |
| commit | c6da59f014ff402256c1a931d44d0b144ebc0177 (patch) | |
| tree | 693548240921f4398a507626f1890fa2410ade4f /src | |
| parent | 745714307256a5edd46a61ed06a9883872841702 (diff) | |
| download | strongswan-c6da59f014ff402256c1a931d44d0b144ebc0177.tar.bz2 strongswan-c6da59f014ff402256c1a931d44d0b144ebc0177.tar.xz | |
Don't queue delete_ike_sa job when setting IKE_DELETING.
This avoids deleting IKE_SAs during reauthentication (without
trying to reestablish them).
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/sa/ike_sa.c | 8 | ||||
| -rw-r--r-- | src/libcharon/sa/ikev2/tasks/ike_delete.c | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index fc69ecb22..926e2d14c 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 29ac87258..f127b0c15 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) |