android-dns: Use plugin features to register attribute handler

1 files changed, 31 insertions, 5 deletions

diff --git a/src/libcharon/plugins/android_dns/android_dns_plugin.c b/src/libcharon/plugins/android_dns/android_dns_plugin.c
index 4e2b5f58b..b8eb11b57 100644
--- a/src/libcharon/plugins/android_dns/android_dns_plugin.c
+++ b/src/libcharon/plugins/android_dns/android_dns_plugin.c
@@ -43,11 +43,39 @@ METHOD(plugin_t, get_name, char*,
 	return "android-dns";
 }
 
+/**
+ * Register handler
+ */
+static bool plugin_cb(private_android_dns_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_android_dns_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_CALLBACK((plugin_feature_callback_t)plugin_cb, NULL),
+			PLUGIN_PROVIDE(CUSTOM, "android-dns"),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
 	private_android_dns_plugin_t *this)
 {
-	hydra->attributes->remove_handler(hydra->attributes,
-									  &this->handler->handler);
 	this->handler->destroy(this->handler);
 	free(this);
 }
@@ -63,14 +91,12 @@ plugin_t *android_dns_plugin_create()
 		.public = {
 			.plugin = {
 				.get_name = _get_name,
-				.reload = (void*)return_false,
+				.get_features = _get_features,
 				.destroy = _destroy,
 			},
 		},
 		.handler = android_dns_handler_create(),
 	);
 
-	hydra->attributes->add_handler(hydra->attributes, &this->handler->handler);
-
 	return &this->public.plugin;
 }