diff options
Diffstat (limited to 'src/libcharon')
| -rw-r--r-- | src/libcharon/Android.mk | 3 | ||||
| -rwxr-xr-x | src/libcharon/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libcharon/daemon.c | 18 | ||||
| -rw-r--r-- | src/libcharon/daemon.h | 9 |
4 files changed, 11 insertions, 22 deletions
diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk index dffe519ac..a7669ab83 100644 --- a/src/libcharon/Android.mk +++ b/src/libcharon/Android.mk @@ -168,8 +168,7 @@ LOCAL_C_INCLUDES += \ $(strongswan_PATH)/src/libstrongswan \ $(strongswan_PATH)/src/libtncif -LOCAL_CFLAGS := $(strongswan_CFLAGS) \ - -DPLUGINS='"$(strongswan_CHARON_PLUGINS)"' +LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_MODULE := libcharon diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index f97984317..8b16de187 100755 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -133,8 +133,7 @@ INCLUDES = \ AM_CFLAGS = \ -DIPSEC_DIR=\"${ipsecdir}\" \ - -DIPSEC_PIDDIR=\"${piddir}\" \ - -DPLUGINS=\""${libcharon_plugins}\"" + -DIPSEC_PIDDIR=\"${piddir}\" libcharon_la_LIBADD = -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB) diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c index ee2db3318..c6238ebab 100644 --- a/src/libcharon/daemon.c +++ b/src/libcharon/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Tobias Brunner + * Copyright (C) 2006-2012 Tobias Brunner * Copyright (C) 2005-2009 Martin Willi * Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2005 Jan Hutter @@ -207,22 +207,10 @@ METHOD(daemon_t, start, void, } METHOD(daemon_t, initialize, bool, - private_daemon_t *this) + private_daemon_t *this, char *plugins) { - DBG1(DBG_DMN, "Starting IKEv2 charon daemon (strongSwan "VERSION")"); - - if (lib->integrity) - { - DBG1(DBG_DMN, "integrity tests enabled:"); - DBG1(DBG_DMN, "lib 'libstrongswan': passed file and segment integrity tests"); - DBG1(DBG_DMN, "lib 'libhydra': passed file and segment integrity tests"); - DBG1(DBG_DMN, "lib 'libcharon': passed file and segment integrity tests"); - DBG1(DBG_DMN, "daemon 'charon': passed file integrity test"); - } - /* load plugins, further infrastructure may need it */ - if (!lib->plugins->load(lib->plugins, NULL, - lib->settings->get_str(lib->settings, "charon.load", PLUGINS))) + if (!lib->plugins->load(lib->plugins, NULL, plugins)) { return FALSE; } diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h index bfbf774ff..ad9ab4cd2 100644 --- a/src/libcharon/daemon.h +++ b/src/libcharon/daemon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Tobias Brunner + * Copyright (C) 2006-2012 Tobias Brunner * Copyright (C) 2005-2009 Martin Willi * Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2005 Jan Hutter @@ -279,14 +279,17 @@ struct daemon_t { * This should be called after the initialization of the daemon because * some plugins require the process to keep additional capabilities. * - * @return TRUE if successful, FALSE otherwise + * @return TRUE, if successful */ bool (*drop_capabilities)(daemon_t *this); /** * Initialize the daemon. + * + * @param plugins list of plugins to load + * @return TRUE, if successful */ - bool (*initialize)(daemon_t *this); + bool (*initialize)(daemon_t *this, char *plugins); /** * Starts the daemon, i.e. spawns the threads of the thread pool. |