From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 1 Feb 2019 11:05:55 +0000 (+0100)
Subject: ikev1: Don't trigger updown event and close action for redundant CHILD_SAs
X-Git-Tag: 5.8.0dr1~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f5cef5d1c8a75cc4c137374d6b02bdef9f80f68;p=thirdparty%2Fstrongswan.git

ikev1: Don't trigger updown event and close action for redundant CHILD_SAs
---

diff --git a/src/libcharon/sa/ikev1/tasks/quick_delete.c b/src/libcharon/sa/ikev1/tasks/quick_delete.c
index 0191a45a8d..67306912f5 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.c
@@ -38,6 +38,7 @@
 
 #include <daemon.h>
 #include <encoding/payloads/delete_payload.h>
+#include <sa/ikev1/task_manager_v1.h>
 
 typedef struct private_quick_delete_t private_quick_delete_t;
 
@@ -106,6 +107,10 @@ static bool delete_child(private_quick_delete_t *this, protocol_id_t protocol,
 	}
 
 	rekeyed = child_sa->get_state(child_sa) == CHILD_REKEYED;
+	if (!rekeyed)
+	{
+		rekeyed = ikev1_child_sa_is_redundant(this->ike_sa, child_sa, NULL);
+	}
 	child_sa->set_state(child_sa, CHILD_DELETING);
 
 	my_ts = linked_list_create_from_enumerator(