From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 23 Aug 2012 12:55:33 +0000 (+0200)
Subject: Preferred EAP methods for eap-dynamic can be configured
X-Git-Tag: 5.0.1~154^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2f1d75eaec862e168b2e1e69f795de3a929b395;p=thirdparty%2Fstrongswan.git

Preferred EAP methods for eap-dynamic can be configured
---

diff --git a/src/libcharon/plugins/eap_dynamic/eap_dynamic.c b/src/libcharon/plugins/eap_dynamic/eap_dynamic.c
index afc29389ac..e6705cc39e 100644
--- a/src/libcharon/plugins/eap_dynamic/eap_dynamic.c
+++ b/src/libcharon/plugins/eap_dynamic/eap_dynamic.c
@@ -51,6 +51,14 @@ struct private_eap_dynamic_t {
 	eap_method_t *method;
 };
 
+/**
+ * Compare two eap_vendor_type_t objects
+ */
+static bool entry_matches(eap_vendor_type_t *item, eap_vendor_type_t *other)
+{
+	return item->type == other->type && item->vendor == other->vendor;
+}
+
 /**
  * Load the given EAP method
  */
@@ -180,6 +188,49 @@ METHOD(eap_method_t, destroy, void,
 	free(this);
 }
 
+/**
+ * Parse preferred EAP types
+ */
+static void handle_preferred_eap_types(private_eap_dynamic_t *this,
+									   char *methods)
+{
+	enumerator_t *enumerator;
+	eap_vendor_type_t *type, *entry;
+	linked_list_t *preferred;
+	char *method;
+
+	/* parse preferred EAP methods, format: type[-vendor], ... */
+	preferred = linked_list_create();
+	enumerator = enumerator_create_token(methods, ",", " ");
+	while (enumerator->enumerate(enumerator, &method))
+	{
+		type = eap_vendor_type_from_string(method);
+		if (type)
+		{
+			preferred->insert_last(preferred, type);
+		}
+	}
+	enumerator->destroy(enumerator);
+
+	enumerator = this->types->create_enumerator(this->types);
+	while (preferred->remove_last(preferred, (void**)&type) == SUCCESS)
+	{	/* move (supported) types to the front, maintain the preferred order */
+		this->types->reset_enumerator(this->types, enumerator);
+		while (enumerator->enumerate(enumerator, &entry))
+		{
+			if (entry_matches(entry, type))
+			{
+				this->types->remove_at(this->types, enumerator);
+				this->types->insert_first(this->types, entry);
+				break;
+			}
+		}
+		free(type);
+	}
+	enumerator->destroy(enumerator);
+	preferred->destroy(preferred);
+}
+
 /**
  * Get all supported EAP methods
  */
@@ -210,6 +261,7 @@ eap_dynamic_t *eap_dynamic_create(identification_t *server,
 								  identification_t *peer)
 {
 	private_eap_dynamic_t *this;
+	char *preferred;
 
 	INIT(this,
 		.public = {
@@ -231,6 +283,12 @@ eap_dynamic_t *eap_dynamic_create(identification_t *server,
 
 	/* get all supported EAP methods */
 	get_supported_eap_types(this);
-
+	/* move preferred methods to the front */
+	preferred = lib->settings->get_str(lib->settings,
+						"%s.plugins.eap-dynamic.preferred", NULL, charon->name);
+	if (preferred)
+	{
+		handle_preferred_eap_types(this, preferred);
+	}
 	return &this->public;
 }