diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-01-19 12:27:56 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-01-19 12:37:42 +0100 |
| commit | f1ba06c1c6eff3e7c6a5666bcb68d3f3e2e8a373 (patch) | |
| tree | cf82f97e848a47f9d45ca1db048ca81c082d2c95 /src/pluto | |
| parent | fdf1f239ef33d9bb69a49138956c6fd52c74a053 (diff) | |
| download | strongswan-f1ba06c1c6eff3e7c6a5666bcb68d3f3e2e8a373.tar.bz2 strongswan-f1ba06c1c6eff3e7c6a5666bcb68d3f3e2e8a373.tar.xz | |
Cache list of plugin names to further simplify its usage.
Also helpful for ipsec statusall to avoid having to enumerate plugins.
Diffstat (limited to 'src/pluto')
| -rw-r--r-- | src/pluto/log.c | 7 | ||||
| -rw-r--r-- | src/pluto/plutomain.c | 15 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/pluto/log.c b/src/pluto/log.c index 91bc57e1a..f6fa226d5 100644 --- a/src/pluto/log.c +++ b/src/pluto/log.c @@ -868,11 +868,8 @@ DBG_dump(const char *label, const void *p, size_t len) static void show_loaded_plugins() { - char *plugins; - - plugins = lib->plugins->loaded_plugins(lib->plugins); - whack_log(RC_COMMENT, "loaded plugins: %s", plugins); - free(plugins); + whack_log(RC_COMMENT, "loaded plugins: %s", + lib->plugins->loaded_plugins(lib->plugins)); } void show_status(bool all, const char *name) diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c index 904ed82c1..dbc857ce2 100644 --- a/src/pluto/plutomain.c +++ b/src/pluto/plutomain.c @@ -264,18 +264,6 @@ static const char *pkcs11_init_args = NULL; /* options read by optionsfrom */ options_t *options; -/** - * Log loaded plugins - */ -static void print_plugins() -{ - char *plugins; - - plugins = lib->plugins->loaded_plugins(lib->plugins); - DBG1(DBG_DMN, "loaded plugins: %s", plugins); - free(plugins); -} - int main(int argc, char **argv) { bool fork_desired = TRUE; @@ -693,7 +681,8 @@ int main(int argc, char **argv) { exit(SS_RC_INITIALIZATION_FAILED); } - print_plugins(); + DBG1(DBG_DMN, "loaded plugins: %s", + lib->plugins->loaded_plugins(lib->plugins)); init_builder(); if (!init_secret() || !init_crypto()) |