Imported Upstream version 4.6.4

1 files changed, 14 insertions, 9 deletions

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c
index 779466472..0eb00dadf 100644
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_plugin.c
@@ -39,13 +39,22 @@ METHOD(plugin_t, get_name, char*,
 	return "kernel-netlink";
 }
 
+METHOD(plugin_t, get_features, int,
+	private_kernel_netlink_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_CALLBACK(kernel_ipsec_register, kernel_netlink_ipsec_create),
+			PLUGIN_PROVIDE(CUSTOM, "kernel-ipsec"),
+		PLUGIN_CALLBACK(kernel_net_register, kernel_netlink_net_create),
+			PLUGIN_PROVIDE(CUSTOM, "kernel-net"),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
 	private_kernel_netlink_plugin_t *this)
 {
-	hydra->kernel_interface->remove_ipsec_interface(hydra->kernel_interface,
-					(kernel_ipsec_constructor_t)kernel_netlink_ipsec_create);
-	hydra->kernel_interface->remove_net_interface(hydra->kernel_interface,
-					(kernel_net_constructor_t)kernel_netlink_net_create);
 	free(this);
 }
 
@@ -60,15 +69,11 @@ plugin_t *kernel_netlink_plugin_create()
 		.public = {
 			.plugin = {
 				.get_name = _get_name,
-				.reload = (void*)return_false,
+				.get_features = _get_features,
 				.destroy = _destroy,
 			},
 		},
 	);
-	hydra->kernel_interface->add_ipsec_interface(hydra->kernel_interface,
-					(kernel_ipsec_constructor_t)kernel_netlink_ipsec_create);
-	hydra->kernel_interface->add_net_interface(hydra->kernel_interface,
-					(kernel_net_constructor_t)kernel_netlink_net_create);
 
 	return &this->public.plugin;
 }