Use task manager as generic interface, renamed implementation to _v2.

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index b50ea2507766e2bfd70b305a8ac3e5c6b69b2bdc..5cb17facfe1db39215d8dc3b90ddd9ab3722b8db 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -66,7 +66,7 @@ sa/child_sa.c sa/child_sa.h \
 sa/ike_sa.c sa/ike_sa.h \
 sa/ike_sa_id.c sa/ike_sa_id.h \
 sa/ike_sa_manager.c sa/ike_sa_manager.h \
-sa/task_manager.c sa/task_manager.h \
+sa/task_manager.h sa/task_manager_v2.c sa/task_manager_v2.h \
 sa/keymat.c sa/keymat.h \
 sa/shunt_manager.c sa/shunt_manager.h \
 sa/trap_manager.c sa/trap_manager.h \

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 29ce3ce8117971a494c16003fd4861022fa1f3a6..03d8345382cffec487606fa2f906da57bbc00673 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -28,7 +28,7 @@
 #include <daemon.h>
 #include <utils/linked_list.h>
 #include <utils/lexparser.h>
-#include <sa/task_manager.h>
+#include <sa/task_manager_v2.h>
 #include <sa/tasks/ike_init.h>
 #include <sa/tasks/ike_natd.h>
 #include <sa/tasks/ike_mobike.h>
@@ -2209,7 +2209,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id)
                .keepalive_interval = lib->settings->get_time(lib->settings,
                                                                        "charon.keep_alive", KEEPALIVE_INTERVAL),
        );
-       this->task_manager = task_manager_create(&this->public);
+       this->task_manager = &(task_manager_v2_create(&this->public)->task_manager);
        this->my_host->set_port(this->my_host, IKEV2_UDP_PORT);
 
        return &this->public;

diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index 5bc6c80c44315bbe55a2adb9e976ffd8b14dc43a..b6cf5404c3e40f2f80173b6d1d7ecaaa035f4245 100644 (file)
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -194,11 +194,4 @@ struct task_manager_t {
        void (*destroy) (task_manager_t *this);
 };
 
-/**
- * Create an instance of the task manager.
- *
- * @param ike_sa               IKE_SA to manage.
- */
-task_manager_t *task_manager_create(ike_sa_t *ike_sa);
-
 #endif /** TASK_MANAGER_H_ @}*/

diff --git a/src/libcharon/sa/task_manager.c b/src/libcharon/sa/task_manager_v2.c
similarity index 98%
rename from src/libcharon/sa/task_manager.c
rename to src/libcharon/sa/task_manager_v2.c
index 8a4e81ac24570709f70bf1c6c8b90b40e90b5123..158c04b5ba2aacb21b746b1bc6b01108fa86f045 100644 (file)
--- a/src/libcharon/sa/task_manager.c
+++ b/src/libcharon/sa/task_manager_v2.c
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-#include "task_manager.h"
+#include "task_manager_v2.h"
 
 #include <math.h>
 
@@ -69,7 +69,7 @@ struct private_task_manager_t {
        /**
         * public functions
         */
-       task_manager_t public;
+       task_manager_v2_t public;
 
        /**
         * associated IKE_SA we are serving
@@ -1106,22 +1106,24 @@ METHOD(task_manager_t, destroy, void,
 /*
  * see header file
  */
-task_manager_t *task_manager_create(ike_sa_t *ike_sa)
+task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa)
 {
        private_task_manager_t *this;
 
        INIT(this,
                .public = {
-                       .process_message = _process_message,
-                       .queue_task = _queue_task,
-                       .initiate = _initiate,
-                       .retransmit = _retransmit,
-                       .incr_mid = _incr_mid,
-                       .reset = _reset,
-                       .adopt_tasks = _adopt_tasks,
-                       .busy = _busy,
-                       .create_task_enumerator = _create_task_enumerator,
-                       .destroy = _destroy,
+                       .task_manager = {
+                               .process_message = _process_message,
+                               .queue_task = _queue_task,
+                               .initiate = _initiate,
+                               .retransmit = _retransmit,
+                               .incr_mid = _incr_mid,
+                               .reset = _reset,
+                               .adopt_tasks = _adopt_tasks,
+                               .busy = _busy,
+                               .create_task_enumerator = _create_task_enumerator,
+                               .destroy = _destroy,
+                       },
                },
                .ike_sa = ike_sa,
                .initiating.type = EXCHANGE_TYPE_UNDEFINED,
@@ -1138,4 +1140,3 @@ task_manager_t *task_manager_create(ike_sa_t *ike_sa)
 
        return &this->public;
 }
-

diff --git a/src/libcharon/sa/task_manager_v2.h b/src/libcharon/sa/task_manager_v2.h
new file mode 100644 (file)
index 0000000..3e55c98
--- /dev/null
+++ b/src/libcharon/sa/task_manager_v2.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011 Martin Willi
+ * Copyright (C) 2011 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup task_manager_v2 task_manager_v2
+ * @{ @ingroup sa
+ */
+
+#ifndef TASK_MANAGER_V2_H_
+#define TASK_MANAGER_V2_H_
+
+typedef struct task_manager_v2_t task_manager_v2_t;
+
+#include <sa/task_manager.h>
+
+/**
+ * Task manager, IKEv2 variant.
+ */
+struct task_manager_v2_t {
+
+       /**
+        * Implements task_manager_t.
+        */
+       task_manager_t task_manager;
+};
+
+/**
+ * Create an instance of the task manager.
+ *
+ * @param ike_sa               IKE_SA to manage.
+ */
+task_manager_v2_t *task_manager_v2_create(ike_sa_t *ike_sa);
+
+#endif /** TASK_MANAGER_V2_H_ @}*/