resolve: Use plugin features to register attribute handler
authorTobias Brunner <tobias@strongswan.org>
Fri, 7 Jun 2013 16:54:36 +0000 (18:54 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 11 Jun 2013 09:18:18 +0000 (11:18 +0200)
src/libhydra/plugins/attr/attr_plugin.c
src/libhydra/plugins/resolve/resolve_plugin.c

index 7d719d0..72fcd6d 100644 (file)
@@ -107,4 +107,3 @@ plugin_t *attr_plugin_create()
 
        return &this->public.plugin;
 }
 
        return &this->public.plugin;
 }
-
index f95827e..2fef09a 100644 (file)
@@ -42,10 +42,39 @@ METHOD(plugin_t, get_name, char*,
        return "resolve";
 }
 
        return "resolve";
 }
 
+/**
+ * Register handler
+ */
+static bool plugin_cb(private_resolve_plugin_t *this,
+                                         plugin_feature_t *feature, bool reg, void *cb_data)
+{
+       if (reg)
+       {
+               hydra->attributes->add_handler(hydra->attributes,
+                                                                          &this->handler->handler);
+       }
+       else
+       {
+               hydra->attributes->remove_handler(hydra->attributes,
+                                                                                 &this->handler->handler);
+       }
+       return TRUE;
+}
+
+METHOD(plugin_t, get_features, int,
+       private_resolve_plugin_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_CALLBACK((plugin_feature_callback_t)plugin_cb, NULL),
+                       PLUGIN_PROVIDE(CUSTOM, "resolve"),
+       };
+       *features = f;
+       return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
        private_resolve_plugin_t *this)
 {
 METHOD(plugin_t, destroy, void,
        private_resolve_plugin_t *this)
 {
-       hydra->attributes->remove_handler(hydra->attributes, &this->handler->handler);
        this->handler->destroy(this->handler);
        free(this);
 }
        this->handler->destroy(this->handler);
        free(this);
 }
@@ -61,13 +90,12 @@ plugin_t *resolve_plugin_create()
                .public = {
                        .plugin = {
                                .get_name = _get_name,
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .destroy = _destroy,
                        },
                },
                .handler = resolve_handler_create(),
        );
                                .destroy = _destroy,
                        },
                },
                .handler = resolve_handler_create(),
        );
-       hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
 
        return &this->public.plugin;
 }
 
        return &this->public.plugin;
 }