Add features support to eap-simaka-pseudonym plugin

diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
index f8761ba16112c4b9c9b87eceaa1f6a5e074353c4..a8e03f6504e06a86e5cb3dfb9ad367aa76bdeaa2 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
+++ b/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.am
@@ -8,6 +8,7 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-simaka-pseudonym.la
+libstrongswan_eap_simaka_pseudonym_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_simaka_pseudonym_la_SOURCES = \

diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
index 7e4c9086f0449e50c91d902dab577e7877139a0b..e2cc0e84fcf765d89ac1902a31a35c743ac16dc6 100644 (file)
--- a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
+++ b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
@@ -48,25 +48,60 @@ METHOD(plugin_t, get_name, char*,
        return "eap-simaka-pseudonym";
 }
 
-METHOD(plugin_t, destroy, void,
-       private_eap_simaka_pseudonym_t *this)
+/**
+ * Callback providing our card to register
+ */
+static simaka_card_t* get_card(private_eap_simaka_pseudonym_t *this)
 {
-       simaka_manager_t *mgr;
-
-       mgr = lib->get(lib, "sim-manager");
-       if (mgr)
+       if (!this->card)
        {
-               mgr->remove_card(mgr, &this->card->card);
-               mgr->remove_provider(mgr, &this->provider->provider);
+               this->card = eap_simaka_pseudonym_card_create();
        }
-       mgr = lib->get(lib, "aka-manager");
-       if (mgr)
+       return &this->card->card;
+}
+
+/**
+ * Callback providing our provider to register
+ */
+static simaka_provider_t* get_provider(private_eap_simaka_pseudonym_t *this)
+{
+       if (!this->provider)
        {
-               mgr->remove_card(mgr, &this->card->card);
-               mgr->remove_provider(mgr, &this->provider->provider);
+               this->provider = eap_simaka_pseudonym_provider_create();
+               if (!this->provider)
+               {
+                       return NULL;
+               }
        }
-       this->card->destroy(this->card);
-       this->provider->destroy(this->provider);
+       return &this->provider->provider;
+}
+
+METHOD(plugin_t, get_features, int,
+       private_eap_simaka_pseudonym_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_CALLBACK(simaka_manager_register, get_card),
+                       PLUGIN_PROVIDE(CUSTOM, "aka-card"),
+                               PLUGIN_DEPENDS(CUSTOM, "aka-manager"),
+                       PLUGIN_PROVIDE(CUSTOM, "sim-card"),
+                               PLUGIN_DEPENDS(CUSTOM, "sim-manager"),
+               PLUGIN_CALLBACK(simaka_manager_register, get_provider),
+                       PLUGIN_PROVIDE(CUSTOM, "aka-provider"),
+                               PLUGIN_DEPENDS(CUSTOM, "aka-manager"),
+                               PLUGIN_DEPENDS(RNG, RNG_WEAK),
+                       PLUGIN_PROVIDE(CUSTOM, "sim-provider"),
+                               PLUGIN_DEPENDS(CUSTOM, "sim-manager"),
+                               PLUGIN_DEPENDS(RNG, RNG_WEAK),
+       };
+       *features = f;
+       return countof(f);
+}
+
+METHOD(plugin_t, destroy, void,
+       private_eap_simaka_pseudonym_t *this)
+{
+       DESTROY_IF(this->card);
+       DESTROY_IF(this->provider);
        free(this);
 }
 
@@ -76,38 +111,17 @@ METHOD(plugin_t, destroy, void,
 plugin_t *eap_simaka_pseudonym_plugin_create()
 {
        private_eap_simaka_pseudonym_t *this;
-       simaka_manager_t *mgr;
 
        INIT(this,
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .destroy = _destroy,
                        },
                },
-               .provider = eap_simaka_pseudonym_provider_create(),
        );
 
-       if (!this->provider)
-       {
-               free(this);
-               return NULL;
-       }
-       this->card = eap_simaka_pseudonym_card_create();
-
-       mgr = lib->get(lib, "sim-manager");
-       if (mgr)
-       {
-               mgr->add_card(mgr, &this->card->card);
-               mgr->add_provider(mgr, &this->provider->provider);
-       }
-       mgr = lib->get(lib, "aka-manager");
-       if (mgr)
-       {
-               mgr->add_card(mgr, &this->card->card);
-               mgr->add_provider(mgr, &this->provider->provider);
-       }
        return &this->public.plugin;
 }