diff options
| author | Martin Willi <martin@strongswan.org> | 2006-03-16 15:25:06 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-03-16 15:25:06 +0000 |
| commit | 16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1 (patch) | |
| tree | b7d3214d59942dbd75ad8b9b8f86468f82f7a496 /Source/charon/daemon.h | |
| parent | b1953ccd05b5e6cf5a87c557208d5f8a1fcad231 (diff) | |
| download | strongswan-16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1.tar.bz2 strongswan-16b9a73cc4bd4c4fafc8618fdd4c05ab72195df1.tar.xz | |
- reworked configuration framework completly
- configuration is now split up in: connections, policies, credentials and daemon config
- further alloc/free fixes needed!
Diffstat (limited to 'Source/charon/daemon.h')
| -rw-r--r-- | Source/charon/daemon.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/Source/charon/daemon.h b/Source/charon/daemon.h index db7b64c62..4b7003179 100644 --- a/Source/charon/daemon.h +++ b/Source/charon/daemon.h @@ -28,6 +28,7 @@ #include <threads/scheduler.h> #include <threads/kernel_interface.h> #include <threads/thread_pool.h> +#include <threads/stroke.h> #include <network/socket.h> #include <sa/ike_sa_manager.h> #include <queues/send_queue.h> @@ -35,6 +36,9 @@ #include <queues/event_queue.h> #include <utils/logger_manager.h> #include <config/configuration.h> +#include <config/connection_store.h> +#include <config/policy_store.h> +#include <config/credential_store.h> /** * Name of the daemon. @@ -62,7 +66,7 @@ /** * Output of log, use NULL for syslog */ -#define LOG_OUTPUT NULL +#define LOG_OUTPUT stdout /** * @brief Default loglevel for every logger context. @@ -115,6 +119,21 @@ struct daemon_t { configuration_t *configuration; /** + * A connection_store_t instance. + */ + connection_store_t *connections; + + /** + * A policy_store_t instance. + */ + policy_store_t *policies; + + /** + * A credential_store_t instance. + */ + credential_store_t *credentials; + + /** * The Sender-Thread. */ sender_t *sender; @@ -140,6 +159,11 @@ struct daemon_t { kernel_interface_t *kernel_interface; /** + * IPC interface, as whack in pluto + */ + stroke_t *stroke; + + /** * @brief Shut down the daemon. * * @param this the daemon to kill |