Moved IKE_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 474703056ceaeb270b2297866f86dfb8b0f4a164..7e2fccdb330d6100eae778e16de000d1a7dd2776 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1325,11 +1325,7 @@ METHOD(ike_sa_t, delete_, status_t,
 METHOD(ike_sa_t, rekey, status_t,
        private_ike_sa_t *this)
 {
-       ike_rekey_t *ike_rekey;
-
-       ike_rekey = ike_rekey_create(&this->public, TRUE);
-
-       this->task_manager->queue_task(this->task_manager, &ike_rekey->task);
+       this->task_manager->queue_ike_rekey(this->task_manager);
        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 012890afaf87f16a9a54b2a587b908ec97f1304a..f135d026230de0c4dad4f8ea23d4d8e240c04c31 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1023,6 +1023,12 @@ METHOD(task_manager_t, queue_ike, void,
        queue_task(this, (task_t*)isakmp_natd_create(this->ike_sa, TRUE));
 }
 
+METHOD(task_manager_t, queue_ike_rekey, void,
+       private_task_manager_t *this)
+{
+       /* TODO-IKEv1: IKE_SA rekeying */
+}
+
 METHOD(task_manager_t, queue_ike_delete, void,
        private_task_manager_t *this)
 {
@@ -1132,6 +1138,7 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
                                .process_message = _process_message,
                                .queue_task = _queue_task,
                                .queue_ike = _queue_ike,
+                               .queue_ike_rekey = _queue_ike_rekey,
                                .queue_ike_delete = _queue_ike_delete,
                                .queue_child = _queue_child,
                                .queue_child_rekey = _queue_child_rekey,

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 5aa96cc4e08b9dbede6faf9fa75472cff9318ea5..fd9572d9219761c6e8f0ea8791f157f77d7c2017 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1200,6 +1200,12 @@ METHOD(task_manager_t, queue_ike, void,
 #endif /* ME */
 }
 
+METHOD(task_manager_t, queue_ike_rekey, void,
+       private_task_manager_t *this)
+{
+       queue_task(this, (task_t*)ike_rekey_create(this->ike_sa, TRUE));
+}
+
 METHOD(task_manager_t, queue_ike_delete, void,
        private_task_manager_t *this)
 {
@@ -1357,6 +1363,7 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
                                .process_message = _process_message,
                                .queue_task = _queue_task,
                                .queue_ike = _queue_ike,
+                               .queue_ike_rekey = _queue_ike_rekey,
                                .queue_ike_delete = _queue_ike_delete,
                                .queue_child = _queue_child,
                                .queue_child_rekey = _queue_child_rekey,

diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index eeccb1aab358e5d52b58d4b5a4531cbcbfd1d23e..6ea48fa1c87898cdf51287286f55473786a3a06d 100644 (file)
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -129,6 +129,11 @@ struct task_manager_t {
         */
        void (*queue_ike)(task_manager_t *this);
 
+       /**
+        * Queue IKE_SA rekey tasks.
+        */
+       void (*queue_ike_rekey)(task_manager_t *this);
+
        /**
         * Queue IKE_SA delete tasks.
         */