Add features support to eap-tnc plugin

1 files changed, 16 insertions, 10 deletions

diff --git a/src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c b/src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c
index 93847e636..2b567c3e0 100644
--- a/src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c
+++ b/src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c
@@ -24,13 +24,24 @@ METHOD(plugin_t, get_name, char*,
 	return "eap-tnc";
 }
 
+METHOD(plugin_t, get_features, int,
+	eap_tnc_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_CALLBACK(eap_method_register, eap_tnc_create_server),
+			PLUGIN_PROVIDE(EAP_SERVER, EAP_TNC),
+				PLUGIN_DEPENDS(EAP_SERVER, EAP_TTLS),
+		PLUGIN_CALLBACK(eap_method_register, eap_tnc_create_peer),
+			PLUGIN_PROVIDE(EAP_PEER, EAP_TNC),
+				PLUGIN_DEPENDS(EAP_PEER, EAP_TTLS),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
 	eap_tnc_plugin_t *this)
 {
-	charon->eap->remove_method(charon->eap,
-							   (eap_constructor_t)eap_tnc_create_server);
-	charon->eap->remove_method(charon->eap,
-							   (eap_constructor_t)eap_tnc_create_peer);
 	free(this);
 }
 
@@ -44,16 +55,11 @@ plugin_t *eap_tnc_plugin_create()
 	INIT(this,
 		.plugin = {
 			.get_name = _get_name,
-			.reload = (void*)return_false,
+			.get_features = _get_features,
 			.destroy = _destroy,
 		},
 	);
 
-	charon->eap->add_method(charon->eap, EAP_TNC, 0, EAP_SERVER,
-							(eap_constructor_t)eap_tnc_create_server);
-	charon->eap->add_method(charon->eap, EAP_TNC, 0, EAP_PEER,
-							(eap_constructor_t)eap_tnc_create_peer);
-
 	return &this->plugin;
 }