Merge tag 'upstream/5.1.0'

Upstream version 5.1.0

1 files changed, 44 insertions, 20 deletions

diff --git a/src/libcharon/plugins/updown/updown_plugin.c b/src/libcharon/plugins/updown/updown_plugin.c
index e1f0d1380..3c1aba5cc 100644
--- a/src/libcharon/plugins/updown/updown_plugin.c
+++ b/src/libcharon/plugins/updown/updown_plugin.c
@@ -49,17 +49,52 @@ METHOD(plugin_t, get_name, char*,
 	return "updown";
 }
 
-METHOD(plugin_t, destroy, void,
-	private_updown_plugin_t *this)
+/**
+ * Register listener
+ */
+static bool plugin_cb(private_updown_plugin_t *this,
+					  plugin_feature_t *feature, bool reg, void *cb_data)
 {
-	charon->bus->remove_listener(charon->bus, &this->listener->listener);
-	this->listener->destroy(this->listener);
-	if (this->handler)
+	if (reg)
 	{
-		hydra->attributes->remove_handler(hydra->attributes,
-										  &this->handler->handler);
-		this->handler->destroy(this->handler);
+		if (lib->settings->get_bool(lib->settings,
+									"charon.plugins.updown.dns_handler", FALSE))
+		{
+			this->handler = updown_handler_create();
+			hydra->attributes->add_handler(hydra->attributes,
+										   &this->handler->handler);
+		}
+		this->listener = updown_listener_create(this->handler);
+		charon->bus->add_listener(charon->bus, &this->listener->listener);
 	}
+	else
+	{
+		charon->bus->remove_listener(charon->bus, &this->listener->listener);
+		this->listener->destroy(this->listener);
+		if (this->handler)
+		{
+			this->handler->destroy(this->handler);
+			hydra->attributes->remove_handler(hydra->attributes,
+											  &this->handler->handler);
+		}
+	}
+	return TRUE;
+}
+
+METHOD(plugin_t, get_features, int,
+	private_updown_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_CALLBACK((plugin_feature_callback_t)plugin_cb, NULL),
+			PLUGIN_PROVIDE(CUSTOM, "updown"),
+	};
+	*features = f;
+	return countof(f);
+}
+
+METHOD(plugin_t, destroy, void,
+	private_updown_plugin_t *this)
+{
 	free(this);
 }
 
@@ -74,22 +109,11 @@ plugin_t *updown_plugin_create()
 		.public = {
 			.plugin = {
 				.get_name = _get_name,
-				.reload = (void*)return_false,
+				.get_features = _get_features,
 				.destroy = _destroy,
 			},
 		},
 	);
 
-	if (lib->settings->get_bool(lib->settings,
-								"charon.plugins.updown.dns_handler", FALSE))
-	{
-		this->handler = updown_handler_create();
-		hydra->attributes->add_handler(hydra->attributes,
-									   &this->handler->handler);
-	}
-	this->listener = updown_listener_create(this->handler);
-	charon->bus->add_listener(charon->bus, &this->listener->listener);
-
 	return &this->public.plugin;
 }
-