Add features support tp eap-simaka-reauth plugin
authorMartin Willi <martin@revosec.ch>
Thu, 13 Oct 2011 15:28:29 +0000 (17:28 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 14 Oct 2011 08:05:49 +0000 (10:05 +0200)
src/libcharon/plugins/eap_simaka_reauth/Makefile.am
src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c

index 0191c9d..0b35c75 100644 (file)
@@ -8,6 +8,7 @@ if MONOLITHIC
 noinst_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la
 else
 plugin_LTLIBRARIES = libstrongswan-eap-simaka-reauth.la
+libstrongswan_eap_simaka_reauth_la_LIBADD = $(top_builddir)/src/libsimaka/libsimaka.la
 endif
 
 libstrongswan_eap_simaka_reauth_la_SOURCES = \
index 2a0377c..ab3ab2f 100644 (file)
@@ -48,25 +48,60 @@ METHOD(plugin_t, get_name, char*,
        return "eap-simaka-reauth";
 }
 
-METHOD(plugin_t, destroy, void,
-       private_eap_simaka_reauth_t *this)
+/**
+ * Callback providing our card to register
+ */
+static simaka_card_t* get_card(private_eap_simaka_reauth_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_reauth_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_reauth_t *this)
+{
+       if (!this->provider)
        {
-               mgr->remove_card(mgr, &this->card->card);
-               mgr->remove_provider(mgr, &this->provider->provider);
+               this->provider = eap_simaka_reauth_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_reauth_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_reauth_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_reauth_plugin_create()
 {
        private_eap_simaka_reauth_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_reauth_provider_create(),
        );
 
-       if (!this->provider)
-       {
-               free(this);
-               return NULL;
-       }
-       this->card = eap_simaka_reauth_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;
 }