attr-sql: Use plugin features with dependency to database backend
authorTobias Brunner <tobias@strongswan.org>
Fri, 7 Jun 2013 13:07:39 +0000 (15:07 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 11 Jun 2013 09:18:17 +0000 (11:18 +0200)
src/libhydra/plugins/attr_sql/attr_sql_plugin.c

index 69e6f7b..702872c 100644 (file)
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -15,6 +16,7 @@
 
 #include <hydra.h>
 #include <utils/debug.h>
+#include <plugins/plugin_feature.h>
 
 #include "attr_sql_plugin.h"
 #include "sql_attribute.h"
@@ -48,12 +50,59 @@ METHOD(plugin_t, get_name, char*,
        return "attr-sql";
 }
 
+/**
+ * Connect to database
+ */
+static bool open_database(private_attr_sql_plugin_t *this,
+                                                 plugin_feature_t *feature, bool reg, void *cb_data)
+{
+       if (reg)
+       {
+               char *uri;
+
+               uri = lib->settings->get_str(lib->settings,
+                                                               "libhydra.plugins.attr-sql.database", NULL);
+               if (!uri)
+               {
+                       DBG1(DBG_CFG, "attr-sql plugin: database URI not set");
+                       return FALSE;
+               }
+
+               this->db = lib->db->create(lib->db, uri);
+               if (!this->db)
+               {
+                       DBG1(DBG_CFG, "attr-sql plugin failed to connect to database");
+                       return FALSE;
+               }
+               this->attribute = sql_attribute_create(this->db);
+               hydra->attributes->add_provider(hydra->attributes,
+                                                                               &this->attribute->provider);
+       }
+       else
+       {
+               hydra->attributes->remove_provider(hydra->attributes,
+                                                                                  &this->attribute->provider);
+               this->attribute->destroy(this->attribute);
+               this->db->destroy(this->db);
+       }
+       return TRUE;
+}
+
+METHOD(plugin_t, get_features, int,
+       private_attr_sql_plugin_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_CALLBACK((plugin_feature_callback_t)open_database, NULL),
+                       PLUGIN_PROVIDE(CUSTOM, "attr-sql"),
+                               PLUGIN_DEPENDS(DATABASE, DB_ANY),
+       };
+       *features = f;
+       return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
        private_attr_sql_plugin_t *this)
 {
-       hydra->attributes->remove_provider(hydra->attributes, &this->attribute->provider);
-       this->attribute->destroy(this->attribute);
-       this->db->destroy(this->db);
        free(this);
 }
 
@@ -63,36 +112,16 @@ METHOD(plugin_t, destroy, void,
 plugin_t *attr_sql_plugin_create()
 {
        private_attr_sql_plugin_t *this;
-       char *uri;
-
-       uri = lib->settings->get_str(lib->settings, "libhydra.plugins.attr-sql.database",
-                                                                                                NULL);
-       if (!uri)
-       {
-               DBG1(DBG_CFG, "attr-sql plugin: database URI not set");
-               return NULL;
-       }
 
        INIT(this,
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .destroy = _destroy,
                        },
                },
-               .db = lib->db->create(lib->db, uri),
        );
 
-       if (!this->db)
-       {
-               DBG1(DBG_CFG, "attr-sql plugin failed to connect to database");
-               free(this);
-               return NULL;
-       }
-       this->attribute = sql_attribute_create(this->db);
-       hydra->attributes->add_provider(hydra->attributes, &this->attribute->provider);
-
        return &this->public.plugin;
 }
-