diff options
Diffstat (limited to 'src/libcharon/daemon.h')
| -rw-r--r-- | src/libcharon/daemon.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h index 04f1fc249..ae590601f 100644 --- a/src/libcharon/daemon.h +++ b/src/libcharon/daemon.h @@ -149,9 +149,13 @@ typedef struct daemon_t daemon_t; #include <config/backend_manager.h> #include <sa/authenticators/eap/eap_manager.h> #include <sa/authenticators/eap/sim_manager.h> +<<<<<<< HEAD +#include <tnccs/tnccs_manager.h> +======= #include <tnc/imc/imc_manager.h> #include <tnc/imv/imv_manager.h> #include <tnc/tnccs/tnccs_manager.h> +>>>>>>> upstream/4.5.1 #ifdef ME #include <sa/connect_manager.h> @@ -239,6 +243,8 @@ struct daemon_t { sim_manager_t *sim; /** +<<<<<<< HEAD +======= * TNC IMC manager controlling Integrity Measurement Collectors */ imc_manager_t *imcs; @@ -249,6 +255,7 @@ struct daemon_t { imv_manager_t *imvs; /** +>>>>>>> upstream/4.5.1 * TNCCS manager to maintain registered TNCCS protocols */ tnccs_manager_t *tnccs; @@ -298,7 +305,11 @@ struct daemon_t { /** * Initialize the daemon. */ +<<<<<<< HEAD + bool (*initialize)(daemon_t *this, bool syslog, level_t levels[]); +======= bool (*initialize)(daemon_t *this); +>>>>>>> upstream/4.5.1 /** * Starts the daemon, i.e. spawns the threads of the thread pool. @@ -317,9 +328,12 @@ extern daemon_t *charon; /** * Initialize libcharon and create the "charon" instance of daemon_t. * +<<<<<<< HEAD +======= * This function initializes the bus, listeners can be registered before * calling initialize(). * +>>>>>>> upstream/4.5.1 * @return FALSE if integrity check failed */ bool libcharon_init(); |