From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 9 May 2012 13:28:29 +0000 (+0200)
Subject: Don't queue delete_ike_sa job when setting IKE_DELETING.
X-Git-Tag: 5.0.0~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6da59f014ff402256c1a931d44d0b144ebc0177;p=thirdparty%2Fstrongswan.git

Don't queue delete_ike_sa job when setting IKE_DELETING.

This avoids deleting IKE_SAs during reauthentication (without
trying to reestablish them).
---

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)