Moved IKE_SA initiate task creation to protocol specific task manager

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index da7ff43ed79a442597a2f65ac9d2bf2cad738117..8d52fdcac34d7d96bfe2c2c5356e723843f9c8fc 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1099,48 +1099,7 @@ METHOD(ike_sa_t, initiate, status_t,
                }
 
                set_condition(this, COND_ORIGINAL_INITIATOR, TRUE);
-
-               if (this->version == IKEV1)
-               {
-                       task = (task_t*)isakmp_vendor_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)isakmp_cert_pre_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)main_mode_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)isakmp_cert_post_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)isakmp_natd_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-               }
-               else
-               {
-                       task = (task_t*)ike_vendor_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_init_create(&this->public, TRUE, NULL);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_natd_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_cert_pre_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_auth_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_cert_post_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_config_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       task = (task_t*)ike_auth_lifetime_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-                       if (this->peer_cfg->use_mobike(this->peer_cfg))
-                       {
-                               task = (task_t*)ike_mobike_create(&this->public, TRUE);
-                               this->task_manager->queue_task(this->task_manager, task);
-                       }
-#ifdef ME
-                       task = (task_t*)ike_me_create(&this->public, TRUE);
-                       this->task_manager->queue_task(this->task_manager, task);
-#endif /* ME */
-               }
+               this->task_manager->queue_ike(this->task_manager);
        }
 
 #ifdef ME

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 5c1c72777c444335fcada7c7454d0d6148cda684..e8399e418026783cf05a886bdac21984f5213cb5 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1011,6 +1011,16 @@ METHOD(task_manager_t, queue_task, void,
        this->queued_tasks->insert_last(this->queued_tasks, task);
 }
 
+METHOD(task_manager_t, queue_ike, void,
+       private_task_manager_t *this)
+{
+       queue_task(this, (task_t*)isakmp_vendor_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)isakmp_cert_pre_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)main_mode_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)isakmp_cert_post_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)isakmp_natd_create(this->ike_sa, TRUE));
+}
+
 METHOD(task_manager_t, queue_dpd, void,
        private_task_manager_t *this)
 {
@@ -1093,6 +1103,7 @@ task_manager_v1_t *task_manager_v1_create(ike_sa_t *ike_sa)
                        .task_manager = {
                                .process_message = _process_message,
                                .queue_task = _queue_task,
+                               .queue_ike = _queue_ike,
                                .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 aa0fb42760053a77d7074fed082d5f1490aa0d01..d28562b70c8c9687d9e13e1f326f325ff0019ba8 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1176,6 +1176,30 @@ METHOD(task_manager_t, queue_task, void,
        this->queued_tasks->insert_last(this->queued_tasks, task);
 }
 
+METHOD(task_manager_t, queue_ike, void,
+       private_task_manager_t *this)
+{
+       peer_cfg_t *peer_cfg;
+
+       queue_task(this, (task_t*)ike_vendor_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)ike_init_create(this->ike_sa, TRUE, NULL));
+       queue_task(this, (task_t*)ike_natd_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)ike_cert_pre_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)ike_auth_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)ike_cert_post_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)ike_config_create(this->ike_sa, TRUE));
+       queue_task(this, (task_t*)ike_auth_lifetime_create(this->ike_sa, TRUE));
+
+       peer_cfg = this->ike_sa->get_peer_cfg(this->ike_sa);
+       if (peer_cfg->use_mobike(peer_cfg))
+       {
+               queue_task(this, (task_t*)ike_mobike_create(this->ike_sa, TRUE));
+       }
+#ifdef ME
+       queue_task(this, (task_t*)ike_me_create(this->ike_sa, TRUE));
+#endif /* ME */
+}
+
 METHOD(task_manager_t, queue_dpd, void,
        private_task_manager_t *this)
 {
@@ -1300,6 +1324,7 @@ task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
                        .task_manager = {
                                .process_message = _process_message,
                                .queue_task = _queue_task,
+                               .queue_ike = _queue_ike,
                                .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 2ef904104c7ac83eb6351b9cff1ca06f142f4197..6a388e411c93acd2f467e2a9b0d131ec1b76ee31 100644 (file)
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -124,6 +124,11 @@ struct task_manager_t {
         */
        void (*queue_task) (task_manager_t *this, task_t *task);
 
+       /**
+        * Queue IKE_SA establishing tasks.
+        */
+       void (*queue_ike)(task_manager_t *this);
+
        /**
         * Queue liveness checking tasks.
         */