ipseckey: Use plugin features and depend on RESOLVER

Also fixed a double-free of the resolver instance.

diff --git a/src/libcharon/plugins/ipseckey/ipseckey_cred.h b/src/libcharon/plugins/ipseckey/ipseckey_cred.h
index 440020f5dc27c1231eabd681a05b1fe0142b581e..f0f52fd6a996a83a43bb1c4f2464d578bb5719dd 100644 (file)
--- a/src/libcharon/plugins/ipseckey/ipseckey_cred.h
+++ b/src/libcharon/plugins/ipseckey/ipseckey_cred.h
@@ -49,7 +49,7 @@ struct ipseckey_cred_t {
  * Create an ipseckey_cred instance which uses the given resolver
  * to query the DNS for IPSECKEY resource records.
  *
- * @param res          resolver to use
+ * @param res          resolver to use (gets adopted)
  * @return                     credential set
  */
 ipseckey_cred_t *ipseckey_cred_create(resolver_t *res);

diff --git a/src/libcharon/plugins/ipseckey/ipseckey_plugin.c b/src/libcharon/plugins/ipseckey/ipseckey_plugin.c
index 9593cf93928ca07232377a1b7983d98afe405ec4..a62a9747e3eb1c41e616d924a4dd45d735516591 100644 (file)
--- a/src/libcharon/plugins/ipseckey/ipseckey_plugin.c
+++ b/src/libcharon/plugins/ipseckey/ipseckey_plugin.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Tobias Brunner
  * Copyright (C) 2012 Reto Guadagnini
  * Hochschule fuer Technik Rapperswil
  *
@@ -31,11 +32,6 @@ struct private_ipseckey_plugin_t {
         */
        ipseckey_plugin_t public;
 
-       /**
-        * DNS resolver instance
-        */
-       resolver_t *res;
-
        /**
         * credential set
         */
@@ -53,15 +49,59 @@ METHOD(plugin_t, get_name, char*,
        return "ipseckey";
 }
 
-METHOD(plugin_t, destroy, void,
-       private_ipseckey_plugin_t *this)
+/**
+ * Create resolver and register credential set
+ */
+static bool plugin_cb(private_ipseckey_plugin_t *this,
+                                         plugin_feature_t *feature, bool reg, void *cb_data)
 {
-       if (this->enabled)
+       if (reg)
+       {
+               resolver_t *res;
+
+               res = lib->resolver->create(lib->resolver);
+               if (!res)
+               {
+                       DBG1(DBG_CFG, "failed to create a DNS resolver instance");
+                       return FALSE;
+               }
+
+               if (this->enabled)
+               {
+                       this->cred = ipseckey_cred_create(res);
+                       lib->credmgr->add_set(lib->credmgr, &this->cred->set);
+               }
+               else
+               {
+                       res->destroy(res);
+               }
+       }
+       else
        {
-               lib->credmgr->remove_set(lib->credmgr, &this->cred->set);
+               if (this->enabled)
+               {
+                       lib->credmgr->remove_set(lib->credmgr, &this->cred->set);
+                       this->cred->destroy(this->cred);
+               }
        }
-       DESTROY_IF(this->res);
-       DESTROY_IF(this->cred);
+       return TRUE;
+}
+
+METHOD(plugin_t, get_features, int,
+       private_ipseckey_plugin_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_CALLBACK((plugin_feature_callback_t)plugin_cb, NULL),
+                       PLUGIN_PROVIDE(CUSTOM, "ipseckey"),
+                               PLUGIN_DEPENDS(RESOLVER),
+       };
+       *features = f;
+       return countof(f);
+}
+
+METHOD(plugin_t, destroy, void,
+       private_ipseckey_plugin_t *this)
+{
        free(this);
 }
 
@@ -76,28 +116,13 @@ plugin_t *ipseckey_plugin_create()
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .destroy = _destroy,
                        },
                },
-               .res = lib->resolver->create(lib->resolver),
                .enabled = lib->settings->get_bool(lib->settings,
                                                        "%s.plugins.ipseckey.enable", FALSE, charon->name),
        );
 
-       if (!this->res)
-       {
-               DBG1(DBG_CFG, "failed to create a DNS resolver instance");
-               destroy(this);
-               return NULL;
-       }
-
-       if (this->enabled)
-       {
-               this->cred = ipseckey_cred_create(this->res);
-               lib->credmgr->add_set(lib->credmgr, &this->cred->set);
-       }
-
        return &this->public.plugin;
 }
-