aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libhydra/Android.mk6
-rw-r--r--src/libhydra/Makefile.am6
-rw-r--r--src/libhydra/hydra.c6
-rw-r--r--src/libhydra/hydra.h18
-rw-r--r--src/libstrongswan/Android.mk8
-rw-r--r--src/libstrongswan/Makefile.am9
-rw-r--r--src/libstrongswan/library.c4
-rw-r--r--src/libstrongswan/library.h18
-rw-r--r--src/libstrongswan/processing/jobs/callback_job.c (renamed from src/libhydra/processing/jobs/callback_job.c)0
-rw-r--r--src/libstrongswan/processing/jobs/callback_job.h (renamed from src/libhydra/processing/jobs/callback_job.h)2
-rw-r--r--src/libstrongswan/processing/jobs/job.h (renamed from src/libhydra/processing/jobs/job.h)2
-rw-r--r--src/libstrongswan/processing/processor.c (renamed from src/libhydra/processing/processor.c)0
-rw-r--r--src/libstrongswan/processing/processor.h (renamed from src/libhydra/processing/processor.h)6
-rw-r--r--src/libstrongswan/processing/scheduler.c (renamed from src/libhydra/processing/scheduler.c)0
-rw-r--r--src/libstrongswan/processing/scheduler.h (renamed from src/libhydra/processing/scheduler.h)2
15 files changed, 43 insertions, 44 deletions
diff --git a/src/libhydra/Android.mk b/src/libhydra/Android.mk
index 47183c6ea..6ef38b1ac 100644
--- a/src/libhydra/Android.mk
+++ b/src/libhydra/Android.mk
@@ -11,11 +11,7 @@ attributes/mem_pool.c attributes/mem_pool.h \
kernel/kernel_interface.c kernel/kernel_interface.h \
kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
kernel/kernel_net.h \
-kernel/kernel_listener.h \
-processing/jobs/job.h \
-processing/jobs/callback_job.c processing/jobs/callback_job.h \
-processing/processor.c processing/processor.h \
-processing/scheduler.c processing/scheduler.h
+kernel/kernel_listener.h
# adding the plugin source files
diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index ebaf79233..d0698d0f5 100644
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -9,11 +9,7 @@ attributes/mem_pool.c attributes/mem_pool.h \
kernel/kernel_interface.c kernel/kernel_interface.h \
kernel/kernel_ipsec.c kernel/kernel_ipsec.h \
kernel/kernel_net.h \
-kernel/kernel_listener.h \
-processing/jobs/job.h \
-processing/jobs/callback_job.c processing/jobs/callback_job.h \
-processing/processor.c processing/processor.h \
-processing/scheduler.c processing/scheduler.h
+kernel/kernel_listener.h
libhydra_la_LIBADD =
diff --git a/src/libhydra/hydra.c b/src/libhydra/hydra.c
index 438ff656c..f180e36bb 100644
--- a/src/libhydra/hydra.c
+++ b/src/libhydra/hydra.c
@@ -43,8 +43,6 @@ void libhydra_deinit()
private_hydra_t *this = (private_hydra_t*)hydra;
this->public.attributes->destroy(this->public.attributes);
this->public.kernel_interface->destroy(this->public.kernel_interface);
- this->public.scheduler->destroy(this->public.scheduler);
- this->public.processor->destroy(this->public.processor);
free((void*)this->public.daemon);
free(this);
hydra = NULL;
@@ -61,15 +59,11 @@ bool libhydra_init(const char *daemon)
.public = {
.attributes = attribute_manager_create(),
.kernel_interface = kernel_interface_create(),
- .processor = processor_create(),
.daemon = strdup(daemon ?: "libhydra"),
},
);
hydra = &this->public;
- /* requires hydra->processor */
- this->public.scheduler = scheduler_create();
-
if (lib->integrity &&
!lib->integrity->check(lib->integrity, "libhydra", libhydra_init))
{
diff --git a/src/libhydra/hydra.h b/src/libhydra/hydra.h
index 29813fbfe..d7a7d8de4 100644
--- a/src/libhydra/hydra.h
+++ b/src/libhydra/hydra.h
@@ -25,12 +25,6 @@
* @defgroup hplugins plugins
* @ingroup libhydra
*
- * @defgroup hprocessing processing
- * @ingroup libhydra
- *
- * @defgroup hjobs jobs
- * @ingroup hprocessing
- *
* @addtogroup libhydra
* @{
*/
@@ -42,8 +36,6 @@ typedef struct hydra_t hydra_t;
#include <attributes/attribute_manager.h>
#include <kernel/kernel_interface.h>
-#include <processing/processor.h>
-#include <processing/scheduler.h>
#include <library.h>
@@ -63,16 +55,6 @@ struct hydra_t {
kernel_interface_t *kernel_interface;
/**
- * process jobs using a thread pool
- */
- processor_t *processor;
-
- /**
- * schedule jobs
- */
- scheduler_t *scheduler;
-
- /**
* name of the daemon that initialized the library
*/
const char *daemon;
diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index ba254f58b..c8989b1f5 100644
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -50,6 +50,11 @@ credentials/cert_validator.h \
database/database.h database/database_factory.h database/database_factory.c \
fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
eap/eap.h eap/eap.c \
+plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h \
+processing/jobs/job.h \
+processing/jobs/callback_job.c processing/jobs/callback_job.h \
+processing/processor.c processing/processor.h \
+processing/scheduler.c processing/scheduler.h \
selectors/traffic_selector.c selectors/traffic_selector.h \
threading/thread.h threading/thread.c \
threading/thread_value.h threading/thread_value.c \
@@ -65,8 +70,7 @@ utils/linked_list.c utils/linked_list.h \
utils/hashtable.c utils/hashtable.h \
utils/enumerator.c utils/enumerator.h \
utils/optionsfrom.c utils/optionsfrom.h \
-utils/backtrace.c utils/backtrace.h \
-plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
+utils/backtrace.c utils/backtrace.h
# adding the plugin source files
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 316d8977d..2ab8aa636 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -49,6 +49,11 @@ credentials/cert_validator.h \
database/database.h database/database_factory.h database/database_factory.c \
fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
eap/eap.h eap/eap.c \
+plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h \
+processing/jobs/job.h \
+processing/jobs/callback_job.c processing/jobs/callback_job.h \
+processing/processor.c processing/processor.h \
+processing/scheduler.c processing/scheduler.h \
selectors/traffic_selector.c selectors/traffic_selector.h \
threading/thread.h threading/thread.c \
threading/thread_value.h threading/thread_value.c \
@@ -64,8 +69,8 @@ utils/linked_list.c utils/linked_list.h \
utils/hashtable.c utils/hashtable.h \
utils/enumerator.c utils/enumerator.h \
utils/optionsfrom.c utils/optionsfrom.h \
-utils/backtrace.c utils/backtrace.h \
-plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
+utils/backtrace.c utils/backtrace.h
+
library.lo : $(top_builddir)/config.status
diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c
index b61bdf7a0..b7e75aec5 100644
--- a/src/libstrongswan/library.c
+++ b/src/libstrongswan/library.c
@@ -65,6 +65,8 @@ void library_deinit()
detailed = lib->settings->get_bool(lib->settings,
"libstrongswan.leak_detective.detailed", TRUE);
+ this->public.scheduler->destroy(this->public.scheduler);
+ this->public.processor->destroy(this->public.processor);
this->public.plugins->destroy(this->public.plugins);
this->public.settings->destroy(this->public.settings);
this->public.credmgr->destroy(this->public.credmgr);
@@ -141,6 +143,8 @@ bool library_init(char *settings)
this->public.encoding = cred_encoding_create();
this->public.fetcher = fetcher_manager_create();
this->public.db = database_factory_create();
+ this->public.processor = processor_create();
+ this->public.scheduler = scheduler_create();
this->public.plugins = plugin_loader_create();
this->public.integrity = NULL;
diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index cd5dfb479..034ff10c5 100644
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -43,6 +43,12 @@
* @defgroup plugins plugins
* @ingroup libstrongswan
*
+ * @defgroup processing processing
+ * @ingroup libstrongswan
+ *
+ * @defgroup jobs jobs
+ * @ingroup processing
+ *
* @defgroup threading threading
* @ingroup libstrongswan
*
@@ -64,6 +70,8 @@
#include "settings.h"
#include "integrity_checker.h"
#include "plugins/plugin_loader.h"
+#include "processing/processor.h"
+#include "processing/scheduler.h"
#include "crypto/crypto_factory.h"
#include "fetcher/fetcher_manager.h"
#include "database/database_factory.h"
@@ -119,6 +127,16 @@ struct library_t {
plugin_loader_t *plugins;
/**
+ * process jobs using a thread pool
+ */
+ processor_t *processor;
+
+ /**
+ * schedule jobs
+ */
+ scheduler_t *scheduler;
+
+ /**
* various settings loaded from settings file
*/
settings_t *settings;
diff --git a/src/libhydra/processing/jobs/callback_job.c b/src/libstrongswan/processing/jobs/callback_job.c
index 4c9a7fdac..4c9a7fdac 100644
--- a/src/libhydra/processing/jobs/callback_job.c
+++ b/src/libstrongswan/processing/jobs/callback_job.c
diff --git a/src/libhydra/processing/jobs/callback_job.h b/src/libstrongswan/processing/jobs/callback_job.h
index 722fa52a4..62da1edd1 100644
--- a/src/libhydra/processing/jobs/callback_job.h
+++ b/src/libstrongswan/processing/jobs/callback_job.h
@@ -15,7 +15,7 @@
/**
* @defgroup callback_job callback_job
- * @{ @ingroup hjobs
+ * @{ @ingroup jobs
*/
#ifndef CALLBACK_JOB_H_
diff --git a/src/libhydra/processing/jobs/job.h b/src/libstrongswan/processing/jobs/job.h
index 62d833e13..0f1c16ebe 100644
--- a/src/libhydra/processing/jobs/job.h
+++ b/src/libstrongswan/processing/jobs/job.h
@@ -16,7 +16,7 @@
/**
* @defgroup job job
- * @{ @ingroup hjobs
+ * @{ @ingroup jobs
*/
#ifndef JOB_H_
diff --git a/src/libhydra/processing/processor.c b/src/libstrongswan/processing/processor.c
index 2a44f61e8..2a44f61e8 100644
--- a/src/libhydra/processing/processor.c
+++ b/src/libstrongswan/processing/processor.c
diff --git a/src/libhydra/processing/processor.h b/src/libstrongswan/processing/processor.h
index 33633f3e2..bebbe3a15 100644
--- a/src/libhydra/processing/processor.h
+++ b/src/libstrongswan/processing/processor.h
@@ -16,7 +16,7 @@
/**
* @defgroup processor processor
- * @{ @ingroup hprocessing
+ * @{ @ingroup processing
*/
#ifndef PROCESSOR_H_
@@ -51,7 +51,7 @@ struct processor_t {
/**
* Get the number of queued jobs.
*
- * @returns number of items in queue
+ * @return number of items in queue
*/
u_int (*get_job_load) (processor_t *this);
@@ -60,7 +60,7 @@ struct processor_t {
*
* This function is non blocking and adds a job_t to the queue.
*
- * @param job job to add to the queue
+ * @param job job to add to the queue
*/
void (*queue_job) (processor_t *this, job_t *job);
diff --git a/src/libhydra/processing/scheduler.c b/src/libstrongswan/processing/scheduler.c
index 8a58e4570..8a58e4570 100644
--- a/src/libhydra/processing/scheduler.c
+++ b/src/libstrongswan/processing/scheduler.c
diff --git a/src/libhydra/processing/scheduler.h b/src/libstrongswan/processing/scheduler.h
index a3439553f..f2c72550f 100644
--- a/src/libhydra/processing/scheduler.h
+++ b/src/libstrongswan/processing/scheduler.h
@@ -17,7 +17,7 @@
/**
* @defgroup scheduler scheduler
- * @{ @ingroup hprocessing
+ * @{ @ingroup processing
*/
#ifndef SCHEDULER_H_
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 09:21:17 +0000