Use static plugin features in libcharon to define essential dependencies

diff --git a/src/charon-nm/nm/nm_backend.c b/src/charon-nm/nm/nm_backend.c
index f8ed23ef16ceaa9edea8432a8105f28e3de75e3d..de9bf27b7b9fd77aac589a3aa058c0e13748738f 100644 (file)
--- a/src/charon-nm/nm/nm_backend.c
+++ b/src/charon-nm/nm/nm_backend.c
@@ -167,6 +167,7 @@ void nm_backend_register()
        static plugin_feature_t features[] = {
                PLUGIN_CALLBACK((plugin_feature_callback_t)nm_backend_cb, NULL),
                        PLUGIN_PROVIDE(CUSTOM, "NetworkManager backend"),
+                               PLUGIN_DEPENDS(CUSTOM, "libcharon"),
        };
        lib->plugins->add_static_features(lib->plugins, "nm-backend", features,
                                                                          countof(features), TRUE);

diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c
index 8a4b3906f5ef0cfac7d4f6d6a98b7b770820e01a..525c987ab731209badbdc9fa65c97d71264e39d6 100644 (file)
--- a/src/libcharon/daemon.c
+++ b/src/libcharon/daemon.c
@@ -32,7 +32,7 @@
 #include "daemon.h"
 
 #include <library.h>
-#include <plugins/plugin.h>
+#include <plugins/plugin_feature.h>
 #include <config/proposal.h>
 #include <kernel/kernel_handler.h>
 #include <processing/jobs/start_action_job.h>
@@ -213,6 +213,15 @@ METHOD(daemon_t, start, void,
 METHOD(daemon_t, initialize, bool,
        private_daemon_t *this, char *plugins)
 {
+       static plugin_feature_t features[] = {
+               PLUGIN_PROVIDE(CUSTOM, "libcharon"),
+                       PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+                       PLUGIN_DEPENDS(RNG, RNG_STRONG),
+                       PLUGIN_DEPENDS(NONCE_GEN),
+       };
+       lib->plugins->add_static_features(lib->plugins, charon->name, features,
+                                                                         countof(features), TRUE);
+
        /* load plugins, further infrastructure may need it */
        if (!lib->plugins->load(lib->plugins, NULL, plugins))
        {