whitelist: Use plugin features to register listener
authorTobias Brunner <tobias@strongswan.org>
Sat, 8 Jun 2013 08:55:42 +0000 (10:55 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 11 Jun 2013 09:18:19 +0000 (11:18 +0200)
src/libcharon/plugins/whitelist/whitelist_plugin.c

index fca9d29..5ba3e14 100644 (file)
@@ -49,10 +49,37 @@ METHOD(plugin_t, get_name, char*,
        return "whitelist";
 }
 
+/**
+ * Register listener
+ */
+static bool plugin_cb(private_whitelist_plugin_t *this,
+                                         plugin_feature_t *feature, bool reg, void *cb_data)
+{
+       if (reg)
+       {
+               charon->bus->add_listener(charon->bus, &this->listener->listener);
+       }
+       else
+       {
+               charon->bus->remove_listener(charon->bus, &this->listener->listener);
+       }
+       return TRUE;
+}
+
+METHOD(plugin_t, get_features, int,
+       private_whitelist_plugin_t *this, plugin_feature_t *features[])
+{
+       static plugin_feature_t f[] = {
+               PLUGIN_CALLBACK((plugin_feature_callback_t)plugin_cb, NULL),
+                       PLUGIN_PROVIDE(CUSTOM, "whitelist"),
+       };
+       *features = f;
+       return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
        private_whitelist_plugin_t *this)
 {
-       charon->bus->remove_listener(charon->bus, &this->listener->listener);
        this->listener->destroy(this->listener);
        DESTROY_IF(this->control);
        free(this);
@@ -69,7 +96,7 @@ plugin_t *whitelist_plugin_create()
                .public = {
                        .plugin = {
                                .get_name = _get_name,
-                               .reload = (void*)return_false,
+                               .get_features = _get_features,
                                .destroy = _destroy,
                        },
                },
@@ -77,7 +104,5 @@ plugin_t *whitelist_plugin_create()
        );
        this->control = whitelist_control_create(this->listener);
 
-       charon->bus->add_listener(charon->bus, &this->listener->listener);
-
        return &this->public.plugin;
 }