4 files changed, 34 insertions, 14 deletions

diff --git a/src/libcharon/sa/ikev1/tasks/informational.c b/src/libcharon/sa/ikev1/tasks/informational.c
index 9de5c2e71..999b497dc 100644
--- a/src/libcharon/sa/ikev1/tasks/informational.c
+++ b/src/libcharon/sa/ikev1/tasks/informational.c
@@ -108,7 +108,7 @@ METHOD(task_t, process_r, status_t,
 					else
 					{
 						this->del = (task_t*)quick_delete_create(this->ike_sa,
-														PROTO_NONE, 0, FALSE);
+												PROTO_NONE, 0, FALSE, FALSE);
 					}
 				}
 				break;
diff --git a/src/libcharon/sa/ikev1/tasks/quick_delete.c b/src/libcharon/sa/ikev1/tasks/quick_delete.c
index bb7d20bdc..9a502f58c 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.c
@@ -54,6 +54,11 @@ struct private_quick_delete_t {
 	 * Send delete even if SA does not exist
 	 */
 	bool force;
+
+	/**
+	 * SA already expired?
+	 */
+	bool expired;
 };
 
 /**
@@ -78,16 +83,29 @@ static bool delete_child(private_quick_delete_t *this,
 
 	child_sa->set_state(child_sa, CHILD_DELETING);
 
-	child_sa->get_usestats(child_sa, TRUE, NULL, &bytes_in);
-	child_sa->get_usestats(child_sa, FALSE, NULL, &bytes_out);
-
-	DBG0(DBG_IKE, "closing CHILD_SA %s{%d} "
-		 "with SPIs %.8x_i (%llu bytes) %.8x_o (%llu bytes) and TS %#R=== %#R",
-		 child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
-		 ntohl(child_sa->get_spi(child_sa, TRUE)), bytes_in,
-		 ntohl(child_sa->get_spi(child_sa, FALSE)), bytes_out,
-		 child_sa->get_traffic_selectors(child_sa, TRUE),
-		 child_sa->get_traffic_selectors(child_sa, FALSE));
+	if (this->expired)
+	{
+		DBG0(DBG_IKE, "closing expired CHILD_SA %s{%d} "
+			 "with SPIs %.8x_i %.8x_o and TS %#R=== %#R",
+			 child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
+			 ntohl(child_sa->get_spi(child_sa, TRUE)),
+			 ntohl(child_sa->get_spi(child_sa, FALSE)),
+			 child_sa->get_traffic_selectors(child_sa, TRUE),
+			 child_sa->get_traffic_selectors(child_sa, FALSE));
+	}
+	else
+	{
+		child_sa->get_usestats(child_sa, TRUE, NULL, &bytes_in);
+		child_sa->get_usestats(child_sa, FALSE, NULL, &bytes_out);
+
+		DBG0(DBG_IKE, "closing CHILD_SA %s{%d} with SPIs "
+			 "%.8x_i (%llu bytes) %.8x_o (%llu bytes) and TS %#R=== %#R",
+			 child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
+			 ntohl(child_sa->get_spi(child_sa, TRUE)), bytes_in,
+			 ntohl(child_sa->get_spi(child_sa, FALSE)), bytes_out,
+			 child_sa->get_traffic_selectors(child_sa, TRUE),
+			 child_sa->get_traffic_selectors(child_sa, FALSE));
+	}
 
 	charon->bus->child_updown(charon->bus, child_sa, FALSE);
 
@@ -190,7 +208,7 @@ METHOD(task_t, destroy, void,
  * Described in header.
  */
 quick_delete_t *quick_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol,
-									u_int32_t spi, bool force)
+									u_int32_t spi, bool force, bool expired)
 {
 	private_quick_delete_t *this;
 
@@ -206,6 +224,7 @@ quick_delete_t *quick_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol,
 		.protocol = protocol,
 		.spi = spi,
 		.force = force,
+		.expired = expired,
 	);
 
 	if (protocol != PROTO_NONE)
diff --git a/src/libcharon/sa/ikev1/tasks/quick_delete.h b/src/libcharon/sa/ikev1/tasks/quick_delete.h
index 1cdf07c48..864262392 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_delete.h
+++ b/src/libcharon/sa/ikev1/tasks/quick_delete.h
@@ -46,9 +46,10 @@ struct quick_delete_t {
  * @param protocol		protocol of CHILD_SA to delete, PROTO_NONE as responder
  * @param spi			inbound SPI of CHILD_SA to delete
  * @param force			send delete even if SA does not exist
+ * @param expired		TRUE if SA already expired
  * @return				quick_delete task to handle by the task_manager
  */
 quick_delete_t *quick_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol,
-									u_int32_t spi, bool force);
+									u_int32_t spi, bool force, bool expired);
 
 #endif /** QUICK_DELETE_H_ @}*/
diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index b9acdb054..dc0a01099 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -773,7 +773,7 @@ METHOD(task_t, process_r, status_t,
 				this->ike_sa->queue_task(this->ike_sa,
 					(task_t*)quick_delete_create(this->ike_sa,
 								this->proposal->get_protocol(this->proposal),
-								this->spi_i, TRUE));
+								this->spi_i, TRUE, TRUE));
 				return ALREADY_DONE;
 			}
 			return SUCCESS;