From: Martin Willi <martin@revosec.ch>
Date: Mon, 19 Dec 2011 13:20:33 +0000 (+0100)
Subject: Moved CHILD_SA rekey task creation to protocol specific task manager
X-Git-Tag: 5.0.0~338^2~9^2~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=463a73cc0f152d5abcf1855826fdaf06441f273e;p=thirdparty%2Fstrongswan.git

Moved CHILD_SA rekey task creation to protocol specific task manager
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index c177a7dcb4..7026608f0b 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1265,10 +1265,7 @@ METHOD(ike_sa_t, remove_child_sa, void,
 METHOD(ike_sa_t, rekey_child_sa, status_t,
 	private_ike_sa_t *this, protocol_id_t protocol, u_int32_t spi)
 {
-	child_rekey_t *child_rekey;
-
-	child_rekey = child_rekey_create(&this->public, protocol, spi);
-	this->task_manager->queue_task(this->task_manager, &child_rekey->task);
+	this->task_manager->queue_child_rekey(this->task_manager, protocol, spi);
 	return this->task_manager->initiate(this->task_manager);
 }
 
diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index d42f63f014..a4509e69cf 100644
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1028,6 +1028,12 @@ METHOD(task_manager_t, queue_child, void,
 	queue_task(this, (task_t*)quick_mode_create(this->ike_sa, cfg, tsi, tsr));
 }
 
+METHOD(task_manager_t, queue_child_rekey, void,
+	private_task_manager_t *this, protocol_id_t protocol, u_int32_t spi)
+{
+	/* TODO-IKEv1: CHILD rekeying */
+}
+
 METHOD(task_manager_t, queue_dpd, void,
 	private_task_manager_t *this)
 {
@@ -1112,6 +1118,7 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
 				.queue_task = _queue_task,
 				.queue_ike = _queue_ike,
 				.queue_child = _queue_child,
+				.queue_child_rekey = _queue_child_rekey,
 				.queue_dpd = _queue_dpd,
 				.initiate = _initiate,
 				.retransmit = _retransmit,
diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index cfc5454916..d8dc9b8c32 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1214,6 +1214,12 @@ METHOD(task_manager_t, queue_child, void,
 	queue_task(this, &task->task);
 }
 
+METHOD(task_manager_t, queue_child_rekey, void,
+	private_task_manager_t *this, protocol_id_t protocol, u_int32_t spi)
+{
+	queue_task(this, (task_t*)child_rekey_create(this->ike_sa, protocol, spi));
+}
+
 METHOD(task_manager_t, queue_dpd, void,
 	private_task_manager_t *this)
 {
@@ -1340,6 +1346,7 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
 				.queue_task = _queue_task,
 				.queue_ike = _queue_ike,
 				.queue_child = _queue_child,
+				.queue_child_rekey = _queue_child_rekey,
 				.queue_dpd = _queue_dpd,
 				.initiate = _initiate,
 				.retransmit = _retransmit,
diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index d4a8eebf86..e2e797c3ff 100644
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -140,6 +140,15 @@ struct task_manager_t {
 	void (*queue_child)(task_manager_t *this, child_cfg_t *cfg, u_int32_t reqid,
 						traffic_selector_t *tsi, traffic_selector_t *tsr);
 
+	/**
+	 * Queue CHILD_SA rekeying tasks.
+	 *
+	 * @param protocol		CHILD_SA protocol, AH|ESP
+	 * @param spi			CHILD_SA SPI to rekey
+	 */
+	void (*queue_child_rekey)(task_manager_t *this, protocol_id_t protocol,
+							  u_int32_t spi);
+
 	/**
 	 * Queue liveness checking tasks.
 	 */