denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved generic infrastructure initialization to libcharon_init(), allows us to preload plugins

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:49 +01:00
parent 74a5dfe537
commit 401818651e
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/daemon.c
+9 -11
View File
@@ -210,16 +210,6 @@ METHOD(daemon_t, initialize, bool,
DBG1(DBG_DMN, "daemon 'charon': passed file integrity test");
}
/* load secrets, ca certificates and crls */
this->public.controller = controller_create();
this->public.eap = eap_manager_create();
this->public.sim = sim_manager_create();
this->public.tnccs = tnccs_manager_create();
this->public.backends = backend_manager_create();
this->public.socket = socket_manager_create();
this->public.traps = trap_manager_create();
this->kernel_handler = kernel_handler_create();
/* load plugins, further infrastructure may need it */
if (!lib->plugins->load(lib->plugins, NULL,
lib->settings->get_str(lib->settings, "charon.load", PLUGINS)))
@@ -271,6 +261,15 @@ private_daemon_t *daemon_create()
.sys_loggers = linked_list_create(),
},
);
charon = &this->public;
this->public.controller = controller_create();
this->public.eap = eap_manager_create();
this->public.sim = sim_manager_create();
this->public.tnccs = tnccs_manager_create();
this->public.backends = backend_manager_create();
this->public.socket = socket_manager_create();
this->public.traps = trap_manager_create();
this->kernel_handler = kernel_handler_create();
#ifdef CAPABILITIES
#ifdef CAPABILITIES_LIBCAP
@@ -303,7 +302,6 @@ bool libcharon_init()
private_daemon_t *this;
this = daemon_create();
charon = &this->public;
/* for uncritical pseudo random numbers */
srandom(time(NULL) + getpid());