summaryrefslogtreecommitdiff
path: root/src/charon/processing/jobs/delete_ike_sa_job.c
diff options
context:
space:
mode:
authorRene Mayrhofer <rene@mayrhofer.eu.org>2009-02-28 22:02:31 +0000
committerRene Mayrhofer <rene@mayrhofer.eu.org>2009-02-28 22:02:31 +0000
commit19364e11c66714324bd3d5d0dc9212db397085cb (patch)
treefe7f5e55f0474dad1d0c29ba7c0a6f4546c99c3a /src/charon/processing/jobs/delete_ike_sa_job.c
parentc7f1b0530b85bc7654e68992f25ed8ced5d0a80d (diff)
downloadvyos-strongswan-19364e11c66714324bd3d5d0dc9212db397085cb.tar.gz
vyos-strongswan-19364e11c66714324bd3d5d0dc9212db397085cb.zip
[svn-upgrade] Integrating new upstream version, strongswan (4.2.12)
Diffstat (limited to 'src/charon/processing/jobs/delete_ike_sa_job.c')
-rw-r--r--src/charon/processing/jobs/delete_ike_sa_job.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/charon/processing/jobs/delete_ike_sa_job.c b/src/charon/processing/jobs/delete_ike_sa_job.c
index 95b60ad01..c37e4e389 100644
--- a/src/charon/processing/jobs/delete_ike_sa_job.c
+++ b/src/charon/processing/jobs/delete_ike_sa_job.c
@@ -13,7 +13,7 @@
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
- * $Id: delete_ike_sa_job.c 3589 2008-03-13 14:14:44Z martin $
+ * $Id: delete_ike_sa_job.c 4722 2008-11-28 15:44:25Z martin $
*/
#include "delete_ike_sa_job.h"
@@ -63,6 +63,11 @@ static void execute(private_delete_ike_sa_job_t *this)
this->ike_sa_id);
if (ike_sa)
{
+ if (ike_sa->get_state(ike_sa) == IKE_PASSIVE)
+ {
+ charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
+ return destroy(this);
+ }
if (this->delete_if_established)
{
if (ike_sa->delete(ike_sa) == DESTROY_ME)