From: Martin Willi <martin@revosec.ch>
Date: Thu, 13 Oct 2011 09:45:41 +0000 (+0200)
Subject: Add features support to socket-default plugin
X-Git-Tag: 4.6.0~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c5aacc270cada99899fbbcc76662abd8229afc0;p=thirdparty%2Fstrongswan.git

Add features support to socket-default plugin
---

diff --git a/src/libcharon/plugins/socket_default/socket_default_plugin.c b/src/libcharon/plugins/socket_default/socket_default_plugin.c
index 1bc8244d50..01d9473bfd 100644
--- a/src/libcharon/plugins/socket_default/socket_default_plugin.c
+++ b/src/libcharon/plugins/socket_default/socket_default_plugin.c
@@ -43,11 +43,20 @@ METHOD(plugin_t, get_name, char*,
 METHOD(plugin_t, destroy, void,
 	private_socket_default_plugin_t *this)
 {
-	charon->socket->remove_socket(charon->socket,
-						(socket_constructor_t)socket_default_socket_create);
 	free(this);
 }
 
+METHOD(plugin_t, get_features, int,
+	private_socket_default_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_CALLBACK(socket_register, socket_default_socket_create),
+			PLUGIN_PROVIDE(CUSTOM, "socket"),
+	};
+	*features = f;
+	return countof(f);
+}
+
 /*
  * see header file
  */
@@ -59,15 +68,11 @@ plugin_t *socket_default_plugin_create()
 		.public = {
 			.plugin = {
 				.get_name = _get_name,
-				.reload = (void*)return_false,
+				.get_features = _get_features,
 				.destroy = _destroy,
 			},
 		},
 	);
 
-	charon->socket->add_socket(charon->socket,
-						(socket_constructor_t)socket_default_socket_create);
-
 	return &this->public.plugin;
 }
-