diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-08-25 15:37:26 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-08-25 15:37:26 +0200 |
| commit | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (patch) | |
| tree | 009fc492961e13860d2a4bc2de8caf2bbe2975e7 /src/manager/main.c | |
| parent | c83921a2b566aa9d55d8ccc7258f04fca6292ee6 (diff) | |
| download | vyos-strongswan-6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349.tar.gz vyos-strongswan-6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349.zip | |
Imported Upstream version 5.1.0
Diffstat (limited to 'src/manager/main.c')
| -rw-r--r-- | src/manager/main.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/manager/main.c b/src/manager/main.c index 15ed38154..5c845b157 100644 --- a/src/manager/main.c +++ b/src/manager/main.c @@ -13,7 +13,7 @@ * for more details. */ -#include <dispatcher.h> +#include <fast_dispatcher.h> #include <utils/debug.h> #include <stdio.h> @@ -27,7 +27,7 @@ int main (int arc, char *argv[]) { - dispatcher_t *dispatcher; + fast_dispatcher_t *dispatcher; storage_t *storage; char *socket; char *database; @@ -35,7 +35,7 @@ int main (int arc, char *argv[]) int threads, timeout; library_init(NULL); - if (!lib->plugins->load(lib->plugins, NULL, + if (!lib->plugins->load(lib->plugins, lib->settings->get_str(lib->settings, "manager.load", PLUGINS))) { return 1; @@ -50,7 +50,7 @@ int main (int arc, char *argv[]) { DBG1(DBG_LIB, "database URI undefined, set manager.database " "in strongswan.conf"); - return 1; + //return 1; } storage = storage_create(database); @@ -59,8 +59,8 @@ int main (int arc, char *argv[]) return 1; } - dispatcher = dispatcher_create(socket, debug, timeout, - (context_constructor_t)manager_create, storage); + dispatcher = fast_dispatcher_create(socket, debug, timeout, + (fast_context_constructor_t)manager_create, storage); dispatcher->add_controller(dispatcher, ikesa_controller_create, NULL); dispatcher->add_controller(dispatcher, gateway_controller_create, NULL); dispatcher->add_controller(dispatcher, auth_controller_create, NULL); @@ -78,4 +78,3 @@ int main (int arc, char *argv[]) return 0; } - |