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 c177a7dcb415d5b23c671b56b837f601fb224eb8..7026608f0b1fe041d862afae4da4d2d6e832c49c 100644 (file)
--- 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 d42f63f0147b7aa80b3f5d7d842a1220f74b73b5..a4509e69cf20a968955f7bd5c0a88a1f796e9240 100644 (file)
--- 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 cfc545491603f0c4d4c3f58717f158cefea7def0..d8dc9b8c325bdae7406ded57fd0f747d1955b1b9 100644 (file)
--- 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 d4a8eebf863df21408c1bb0bcf0fbc7a90a325ea..e2e797c3ff52922012d0347d703885b4ee78c414 100644 (file)
--- 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.
         */