plugin-loader: Add method to print loaded plugins on a given log level

diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index f898fd6500656806807ed1a5c03225406cc8a62b..d0e20f9beb80b80e16a185efe3d2c3c2d4d7802e 100644 (file)
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -361,6 +361,7 @@ int main(int argc, char *argv[])
        }
        DBG1(DBG_DMN, "Starting charon-cmd IKE client (strongSwan %s, %s %s, %s)",
                 VERSION, utsname.sysname, utsname.release, utsname.machine);
+       lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
        /* add handler for SEGV and ILL,
         * INT, TERM and HUP are handled by sigwait() in run() */

diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
index 61f2937cea8dcc5e2fed5aad2af61a947402f305..d61ddee8514cea8aedf7403dd9d19872680f1094 100644 (file)
--- a/src/charon-nm/charon-nm.c
+++ b/src/charon-nm/charon-nm.c
@@ -212,6 +212,7 @@ int main(int argc, char *argv[])
                DBG1(DBG_DMN, "initialization failed - aborting charon-nm");
                goto deinit;
        }
+       lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
        if (!charon->caps->drop(charon->caps))
        {

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 0b39058a65c7bab4cc9d4c7ff184556176a3ebf6..4e364e7bee7b997149eaef876570aaf1fc6722b5 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -311,6 +311,7 @@ int main(int argc, char *argv[])
                DBG1(DBG_DMN, "initialization failed - aborting %s", dmn_name);
                goto deinit;
        }
+       lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
        /* set global pidfile name depending on daemon name */
        if (asprintf(&pidfile_name, IPSEC_PIDDIR"/%s.pid", dmn_name) < 0)

diff --git a/src/charon/charon.c b/src/charon/charon.c
index 812b7620b1c4d5008b01839ce757ecf86774a821..eb7dd58e3eee8c113eaf93e14b515874975b3991 100644 (file)
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -398,6 +398,7 @@ int main(int argc, char *argv[])
                DBG1(DBG_DMN, "initialization failed - aborting charon");
                goto deinit;
        }
+       lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
        if (check_pidfile())
        {

diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index c2251effa1073299d3ebd7a77e217970e5dcb868..56d98bbe240e4de298166b9e191ce5dae9d9f400 100644 (file)
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -518,6 +518,8 @@ int main(int argc, char *argv[])
        {
                return 1;
        }
+       lib->plugins->status(lib->plugins, LEVEL_CTRL);
+
        if (!load_certs(conftest->test, conftest->suite_dir))
        {
                return 1;

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index 370c52af97bac2feff1b050319bf583ea55d64fb..721c3a4a5063230b91046dc47e0824c813f47e9a 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -565,6 +565,7 @@ JNI_METHOD(CharonVpnService, initializeCharon, void,
                library_deinit();
                return;
        }
+       lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
        /* add handler for SEGV and ILL etc. */
        action.sa_handler = segv_handler;

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index b27e1776a9728a93b21791ca650e7a9b6f671283..70262b73692df579475197b08e5af1a49d859810 100644 (file)
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -538,8 +538,6 @@ METHOD(daemon_t, initialize, bool,
        {
                return FALSE;
        }
-       DBG1(DBG_DMN, "loaded plugins: %s",
-                lib->plugins->loaded_plugins(lib->plugins));
 
        this->public.ike_sa_manager = ike_sa_manager_create();
        if (this->public.ike_sa_manager == NULL)

diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index 2c8eae988ef9bdf2afbc37b56ada31b13651fa52..26310645b5c7ee0db1eb5ef31e1c82dd0f390a85 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -1082,6 +1082,15 @@ METHOD(plugin_loader_t, loaded_plugins, char*,
        return this->loaded_plugins ?: "";
 }
 
+METHOD(plugin_loader_t, status, void,
+       private_plugin_loader_t *this, level_t level)
+{
+       if (this->loaded_plugins)
+       {
+               dbg(DBG_LIB, level, "loaded plugins: %s", this->loaded_plugins);
+       }
+}
+
 METHOD(plugin_loader_t, destroy, void,
        private_plugin_loader_t *this)
 {
@@ -1109,6 +1118,7 @@ plugin_loader_t *plugin_loader_create()
                        .create_plugin_enumerator = _create_plugin_enumerator,
                        .has_feature = _has_feature,
                        .loaded_plugins = _loaded_plugins,
+                       .status = _status,
                        .destroy = _destroy,
                },
                .plugins = linked_list_create(),

diff --git a/src/libstrongswan/plugins/plugin_loader.h b/src/libstrongswan/plugins/plugin_loader.h
index 6bb9d6e75a3f8fd93c19b81416368ae3fdc22331..d4f74b923e817cb1a483ac73228d3b399143c55b 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.h
+++ b/src/libstrongswan/plugins/plugin_loader.h
@@ -25,6 +25,7 @@
 typedef struct plugin_loader_t plugin_loader_t;
 
 #include <collections/enumerator.h>
+#include <utils/debug.h>
 
 /* to avoid circular references we can't include plugin_feature.h */
 struct plugin_feature_t;
@@ -109,6 +110,13 @@ struct plugin_loader_t {
         */
        char* (*loaded_plugins)(plugin_loader_t *this);
 
+       /**
+        * Log status about loaded plugins and features.
+        *
+        * @param level                 log level to use
+        */
+       void (*status)(plugin_loader_t *this, level_t level);
+
        /**
         * Unload loaded plugins, destroy plugin_loader instance.
         */

diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c
index 17f4d7c5d4a87b2ebcbb00ee8049f4783c9766d7..11174c96f502b1d12147bbf8f5849daf91bd1d63 100644 (file)
--- a/src/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
@@ -929,8 +929,7 @@ int main(int argc, char **argv)
        {
                exit_scepclient("plugin loading failed");
        }
-       DBG1(DBG_APP, "  loaded plugins: %s",
-                lib->plugins->loaded_plugins(lib->plugins));
+       lib->plugins->status(lib->plugins, LEVEL_DIAG);
 
        if ((filetype_out == 0) && (!request_ca_certificate))
        {