Attachment 596088 Details for Bug 834444 – Always use OKC for WPA Enterprise configs

[patch] Always use OKC for WPA Enterprise configs

rh834444-wpa-eap-always-okc.patch (text/plain), 2.69 KB, created by Dan Williams on 2012-07-03 19:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Williams

Created: 2012-07-03 19:54:31 UTC

Size: 2.69 KB

patch

obsolete

>diff -up NetworkManager-0.8.1/src/supplicant-manager/nm-supplicant-config.c.foo NetworkManager-0.8.1/src/supplicant-manager/nm-supplicant-config.c
>--- NetworkManager-0.8.1/src/supplicant-manager/nm-supplicant-config.c.foo	2012-06-21 17:01:16.105196413 -0500
>+++ NetworkManager-0.8.1/src/supplicant-manager/nm-supplicant-config.c	2012-06-21 17:05:01.375946277 -0500
>@@ -706,13 +706,23 @@ nm_supplicant_config_add_setting_wireles
> 				return FALSE;
> 		}
> 
>-		if (!wifi_wext_only && !strcmp (key_mgmt, "wpa-eap")) {
>+		if (!strcmp (key_mgmt, "wpa-eap")) {
> 			/* If using WPA Enterprise, enable optimized background scanning
> 			 * to ensure roaming within an ESS works well.
> 			 */
>-			if (!nm_supplicant_config_add_option (self, "bgscan", "simple:30:-45:300", -1, FALSE))
>-				nm_log_warn (LOGD_SUPPLICANT, "Error enabling background scanning for ESS roaming");
>+			if (!wifi_wext_only) {
>+				if (!nm_supplicant_config_add_option (self, "bgscan", "simple:30:-45:300", -1, FALSE))
>+					nm_log_warn (LOGD_SUPPLICANT, "Error enabling background scanning for ESS roaming");
>+			}
>+
>+			/* When using WPA-Enterprise, we want to use Proactive Key Caching (also
>+			 * called Opportunistic Key Caching) to avoid full EAP exchanges when
>+			 * roaming between access points in the same mobility group.
>+			 */
>+			if (!nm_supplicant_config_add_option (self, "proactive_key_caching", "1", -1, FALSE))
>+				return FALSE;
> 		}
>+
> 	}
> 
> 	return TRUE;
>@@ -730,7 +740,7 @@ nm_supplicant_config_add_setting_8021x (
> 	gboolean success, added;
> 	GString *phase1, *phase2;
> 	const GByteArray *array;
>-	gboolean peap = FALSE, fast = FALSE;
>+	gboolean fast = FALSE;
> 	guint32 i, num_eap;
> 	gboolean fast_provisoning_allowed = FALSE;
> 
>@@ -762,25 +772,12 @@ nm_supplicant_config_add_setting_8021x (
> 	for (i = 0; i < num_eap; i++) {
> 		const char *method = nm_setting_802_1x_get_eap_method (setting, i);
> 
>-		if (method && (strcasecmp (method, "peap") == 0))
>-			peap = TRUE;
> 		if (method && (strcasecmp (method, "fast") == 0)) {
> 			fast = TRUE;
> 			priv->fast_required = TRUE;
> 		}
> 	}
> 
>-	/* When using PEAP-GTC, we're likely using Cisco kit, so we want to turn
>-	 * on PMKSA caching so that roaming between access points actually works
>-	 * without a full reauth (which requires a new token code).  We may want
>-	 * to extend this to all PEAP phase2 methods at some point.
>-	 */
>-	value = nm_setting_802_1x_get_phase2_auth (setting);
>-	if (peap && value && (strcasecmp (value, "gtc") == 0)) {
>-		if (!nm_supplicant_config_add_option (self, "proactive_key_caching", "1", -1, FALSE))
>-			return FALSE;
>-	}
>-
> 	/* Drop the fragment size a bit for better compatibility */
> 	if (!nm_supplicant_config_add_option (self, "fragment_size", "1300", -1, FALSE))
> 		return FALSE;

Actions: View | Diff

Attachments on bug 834444: 596088