Added a generic callback to register EAP methods using plugin features

diff --git a/src/libcharon/sa/authenticators/eap/eap_method.c b/src/libcharon/sa/authenticators/eap/eap_method.c
index 0fa4a00c5258ee172983fd1ba57304709c939c60..536dab7080f1dadd792460316980064422769c8a 100644 (file)
--- a/src/libcharon/sa/authenticators/eap/eap_method.c
+++ b/src/libcharon/sa/authenticators/eap/eap_method.c
@@ -15,8 +15,28 @@
 
 #include "eap_method.h"
 
+#include <daemon.h>
+
 ENUM(eap_role_names, EAP_SERVER, EAP_PEER,
        "EAP_SERVER",
        "EAP_PEER",
 );
 
+/**
+ * See header
+ */
+bool eap_method_register(plugin_t *plugin, plugin_feature_t *feature,
+                                                bool reg, void *data)
+{
+       if (reg)
+       {
+               charon->eap->add_method(charon->eap, feature->eap, 0,
+                                       feature->type == FEATURE_EAP_SERVER ? EAP_SERVER : EAP_PEER,
+                                       (eap_constructor_t)data);
+       }
+       else
+       {
+               charon->eap->remove_method(charon->eap, (eap_constructor_t)data);
+       }
+       return TRUE;
+}

diff --git a/src/libcharon/sa/authenticators/eap/eap_method.h b/src/libcharon/sa/authenticators/eap/eap_method.h
index 0eab2b5ff6ad836e2a005be50651a82a6774d561..6242a5a6e7f65981d05368df2b12c9b29c12409e 100644 (file)
--- a/src/libcharon/sa/authenticators/eap/eap_method.h
+++ b/src/libcharon/sa/authenticators/eap/eap_method.h
@@ -25,6 +25,7 @@ typedef struct eap_method_t eap_method_t;
 typedef enum eap_role_t eap_role_t;
 
 #include <library.h>
+#include <plugins/plugin.h>
 #include <utils/identification.h>
 #include <eap/eap.h>
 #include <encoding/payloads/eap_payload.h>
@@ -159,4 +160,18 @@ struct eap_method_t {
 typedef eap_method_t *(*eap_constructor_t)(identification_t *server,
                                                                                   identification_t *peer);
 
+/**
+ * Helper function to (un-)register EAP methods from plugin features.
+ *
+ * This function is a plugin_feature_callback_t and can be used with the
+ * PLUGIN_CALLBACK macro to register a EAP method constructor.
+ *
+ * @param plugin               plugin registering the EAP method constructor
+ * @param feature              associated plugin feature
+ * @param reg                  TRUE to register, FALSE to unregister.
+ * @param data                 data passed to callback, an eap_constructor_t
+ */
+bool eap_method_register(plugin_t *plugin, plugin_feature_t *feature,
+                                                bool reg, void *data);
+
 #endif /** EAP_METHOD_H_ @}*/