X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/35d0313a5cb927ddc4882ae01bb411d844e8cffc..49417b68d05e44f253f2a97e1d0a9422b5330a55:/openwrt/package/wificonf/wificonf.c?ds=sidebyside

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 7a9cde5a1..b3acbff69 100644
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -76,8 +76,11 @@
 			ifname, strerror(errno)); \
 	} } while(0)
 
+void set_wext_ssid(int skfd, char *ifname);
+
 char *prefix;
 char buffer[128];
+int wpa_enc = 0;
 
 char *wl_var(char *name)
 {
@@ -123,11 +126,11 @@ int bcom_set_val(int skfd, char *ifname, char *var, void *val, int len)
 		return -1;
 
 	strcpy(buf, var);
+	memcpy(&buf[strlen(var) + 1], val, len);
 	
-	if ((ret = bcom_ioctl(skfd, ifname, WLC_GET_VAR, buf, sizeof(buf))))
+	if ((ret = bcom_ioctl(skfd, ifname, WLC_SET_VAR, buf, sizeof(buf))))
 		return ret;
 
-	memcpy(val, buf, len);
 	return 0;	
 }
 
@@ -136,49 +139,58 @@ int bcom_set_int(int skfd, char *ifname, char *var, int val)
 	return bcom_set_val(skfd, ifname, var, &val, sizeof(val));
 }
 
+void stop_bcom(int skfd, char *ifname)
+{
+	int val = 0;
+	wlc_ssid_t ssid;
+	
+	if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
+		return;
+	
+	ssid.SSID_len = 0;
+	ssid.SSID[0] = 0;
+	bcom_ioctl(skfd, ifname, WLC_SET_SSID, &ssid, sizeof(ssid));
+	bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
+
+}
+
+void start_bcom(int skfd, char *ifname)
+{
+	int val = 0;
+	
+	if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
+		return;
+
+	bcom_ioctl(skfd, ifname, WLC_UP, &val, sizeof(val));
+	set_wext_ssid(skfd, ifname);
+}
+
+
 void setup_bcom(int skfd, char *ifname)
 {
 	int val = 0;
 	char buf[8192];
 	char wbuf[80];
 	char *v;
+	int wds_enabled = 0;
 	
 	if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
 		return;
-
-	bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
 	
-	if (nvram_match(wl_var("auth_mode"), "wpa") || nvram_match(wl_var("auth_mode"), "psk") || (nvram_get(wl_var("akm")) && !nvram_disabled(wl_var("akm")))) {
-		/* Set up WPA */
-		if (nvram_match(wl_var("crypto"), "tkip"))
-			val = TKIP_ENABLED;
-		else if (nvram_match(wl_var("crypto"), "aes"))
-			val = AES_ENABLED;
-		else if (nvram_match(wl_var("crypto"), "tkip+aes"))
-			val = TKIP_ENABLED | AES_ENABLED;
-		else
-			val = 0;
-		bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
-
-		if (val && nvram_get(wl_var("wpa_psk"))) {
-			val = 1;
-			bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
-		}
-	}
+	nvram_set(wl_var("ifname"), ifname);
+	
+	stop_bcom(skfd, ifname);
 
-	/* Set up afterburner */
-	val = ABO_AUTO;
-	if (nvram_enabled(wl_var("afterburner")))
-		val = ABO_ON;
-	if (nvram_disabled(wl_var("afterburner")))
-		val = ABO_OFF;
-	bcom_set_val(skfd, ifname, "afterburner_override", &val, sizeof(val));
+	/* Set Country */
+	strncpy(buf, nvram_safe_get(wl_var("country_code")), 4);
+	buf[3] = 0;
+	bcom_ioctl(skfd, ifname, WLC_SET_COUNTRY, buf, 4);
 	
 	/* Set other options */
-	if (v = nvram_get(wl_var("lazywds"))) {
-		val = atoi(v);
-		bcom_ioctl(skfd, ifname, WLC_SET_LAZYWDS, &val, sizeof(val));
-	}
+	val = nvram_enabled(wl_var("lazywds"));
+	wds_enabled = val;
+	bcom_ioctl(skfd, ifname, WLC_SET_LAZYWDS, &val, sizeof(val));
+	
 	if (v = nvram_get(wl_var("frag"))) {
 		val = atoi(v);
 		bcom_ioctl(skfd, ifname, WLC_SET_FRAG, &val, sizeof(val));
@@ -252,11 +264,25 @@ void setup_bcom(int skfd, char *ifname)
 			if (ether_atoe(wbuf, addr->ether_addr_octet)) {
 				wdslist->count++;
 				addr++;
+				wds_enabled = 1;
 			}
 		}
 		bcom_ioctl(skfd, ifname, WLC_SET_WDSLIST, buf, sizeof(buf));
 	}
 	
+	/* Set up afterburner, disabled it if WDS is enabled */
+	if (wds_enabled) {
+		val = ABO_OFF;
+	} else {
+		val = ABO_AUTO;
+		if (nvram_enabled(wl_var("afterburner")))
+			val = ABO_ON;
+		if (nvram_disabled(wl_var("afterburner")))
+			val = ABO_OFF;
+	}
+	
+	bcom_set_val(skfd, ifname, "afterburner_override", &val, sizeof(val));
+	
 	/* Set up G mode */
 	bcom_ioctl(skfd, ifname, WLC_GET_PHYTYPE, &val, sizeof(val));
 	if (val == 2) {
@@ -294,39 +320,74 @@ void setup_bcom(int skfd, char *ifname)
 		}
 	}
 
-}
+	start_bcom(skfd, ifname);
 
-void set_wext_ssid(int skfd, char *ifname)
-{
-	char *buffer;
-	struct iwreq wrq;
+	if (!(v = nvram_get(wl_var("akm"))))
+		v = nvram_safe_get(wl_var("auth_mode"));
+	
+	if (strstr(v, "wpa") || strstr(v, "psk")) {
+		wpa_enc = 1;
 
-	if (buffer = nvram_get(wl_var("ssid"))) {
-		if (strlen(buffer) > IW_ESSID_MAX_SIZE) {
-			ABORT_ARG_SIZE("Set ESSID", SIOCSIWESSID, IW_ESSID_MAX_SIZE);
-		} else {
-			char essid[IW_ESSID_MAX_SIZE + 1];
-
-			wrq.u.essid.flags = 1;
-			strcpy(essid, buffer);
-			wrq.u.essid.pointer = (caddr_t) essid;
-			wrq.u.essid.length = strlen(essid) + 1;
-			IW_SET_EXT_ERR(skfd, ifname, SIOCSIWESSID, &wrq, "Set ESSID");
+		/* Set up WPA */
+		if (nvram_match(wl_var("crypto"), "tkip"))
+			val = TKIP_ENABLED;
+		else if (nvram_match(wl_var("crypto"), "aes"))
+			val = AES_ENABLED;
+		else if (nvram_match(wl_var("crypto"), "tkip+aes") || nvram_match(wl_var("crypto"), "aes+tkip"))
+			val = TKIP_ENABLED | AES_ENABLED;
+		else
+			val = 0;
+		bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
+
+		if (val && strstr(v, "psk")) {
+			v = nvram_safe_get(wl_var("wpa_psk"));
+
+			if ((strlen(v) >= 8) && (strlen(v) < 63)) {
+				val = 4;
+				bcom_ioctl(skfd, ifname, WLC_SET_WPA_AUTH, &val, sizeof(val));
+				
+				bcom_ioctl(skfd, ifname, WLC_GET_AP, &val, sizeof(val));
+				if (!val) {
+					/* Enable in-driver WPA supplicant */
+					wsec_pmk_t pmk;
+					
+					pmk.key_len = (unsigned short) strlen(v);
+					pmk.flags = WSEC_PASSPHRASE;
+					strcpy(pmk.key, v);
+					bcom_ioctl(skfd, ifname, WLC_SET_WSEC_PMK, &pmk, sizeof(pmk));
+					bcom_set_int(skfd, ifname, "sup_wpa", 1);
+				}
+			}
+		} else  {
+			val = 1;
+			bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
 		}
+	} else {
+		val = 0;
+
+		bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
+		bcom_ioctl(skfd, ifname, WLC_SET_WPA_AUTH, &val, sizeof(val));
+		bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
+		bcom_set_int(skfd, ifname, "sup_wpa", 0);
 	}
 }
 
-void start_bcom(int skfd, char *ifname)
+void set_wext_ssid(int skfd, char *ifname)
 {
-	int val = 0;
-	
-	if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
-		return;
+	char *buffer;
+	char essid[IW_ESSID_MAX_SIZE + 1];
+	struct iwreq wrq;
 
-	bcom_ioctl(skfd, ifname, WLC_UP, &val, sizeof(val));
+	buffer = nvram_get(wl_var("ssid"));
 	
-	/* Need to re-set SSID after WLC_UP */
-	set_wext_ssid(skfd, ifname);
+	if (!buffer || (strlen(buffer) > IW_ESSID_MAX_SIZE)) 
+		buffer = "OpenWrt";
+
+	wrq.u.essid.flags = 1;
+	strcpy(essid, buffer);
+	wrq.u.essid.pointer = (caddr_t) essid;
+	wrq.u.essid.length = strlen(essid) + 1;
+	IW_SET_EXT_ERR(skfd, ifname, SIOCSIWESSID, &wrq, "Set ESSID");
 }
 
 void setup_wext_wep(int skfd, char *ifname)
@@ -336,7 +397,8 @@ void setup_wext_wep(int skfd, char *ifname)
 	char keystr[5];
 	char *keyval;
 	unsigned char key[IW_ENCODING_TOKEN_MAX];
-
+	
+	memset(&wrq, 0, sizeof(wrq));
 	strcpy(keystr, "key1");
 	for (i = 1; i <= 4; i++) {
 		if (keyval = nvram_get(wl_var(keystr))) {
@@ -352,7 +414,7 @@ void setup_wext_wep(int skfd, char *ifname)
 		keystr[3]++;
 	}
 	
-	
+	memset(&wrq, 0, sizeof(wrq));
 	i = atoi(nvram_safe_get(wl_var("key")));
 	if (i > 0 && i < 4) {
 		wrq.u.data.flags = i | IW_ENCODE_RESTRICTED;
@@ -360,14 +422,25 @@ void setup_wext_wep(int skfd, char *ifname)
 	}
 }
 
+void set_wext_mode(skfd, ifname)
+{
+	struct iwreq wrq;
+	int ap = 0, infra = 0, wet = 0;
+	
+	/* Set operation mode */
+	ap = !nvram_match(wl_var("mode"), "sta") && !nvram_match(wl_var("mode"), "wet");
+	infra = !nvram_disabled(wl_var("infra"));
+	wet = !ap && !nvram_disabled(wl_var("wet"));
+
+	wrq.u.mode = (!infra ? IW_MODE_ADHOC : (ap ? IW_MODE_MASTER : (wet ? IW_MODE_REPEAT : IW_MODE_INFRA)));
+	IW_SET_EXT_ERR(skfd, ifname, SIOCSIWMODE, &wrq, "Set Mode");
+}
+
 void setup_wext(int skfd, char *ifname)
 {
 	char *buffer;
 	struct iwreq wrq;
 
-	/* Set ESSID */
-	set_wext_ssid(skfd, ifname);
-	
 	/* Set channel */
 	int channel = atoi(nvram_safe_get(wl_var("channel")));
 	
@@ -380,16 +453,7 @@ void setup_wext(int skfd, char *ifname)
 		wrq.u.freq.m = channel;
 		IW_SET_EXT_ERR(skfd, ifname, SIOCSIWFREQ, &wrq, "Set Frequency");
 	}
-	
-	/* Set operation mode */
-	int ap = 0, infra = 0, wet = 0;
-	
-	ap = !nvram_match(wl_var("mode"), "sta");
-	infra = !nvram_disabled(wl_var("infra"));
-	wet = nvram_enabled(wl_var("wet"));
 
-	wrq.u.mode = (!infra ? IW_MODE_ADHOC : (ap ? IW_MODE_MASTER : (wet ? IW_MODE_REPEAT : IW_MODE_INFRA)));
-	IW_SET_EXT_ERR(skfd, ifname, SIOCSIWMODE, &wrq, "Set Mode");
 
 	/* Disable radio if wlX_radio is set and not enabled */
 	wrq.u.txpower.disabled = nvram_disabled(wl_var("radio"));
@@ -400,8 +464,11 @@ void setup_wext(int skfd, char *ifname)
 	IW_SET_EXT_ERR(skfd, ifname, SIOCSIWTXPOW, &wrq, "Set Tx Power");
 
 	/* Set up WEP */
-	if (nvram_enabled(wl_var("wep")))
+	if (nvram_enabled(wl_var("wep")) && !wpa_enc)
 		setup_wext_wep(skfd, ifname);
+	
+	/* Set ESSID */
+	set_wext_ssid(skfd, ifname);
 
 }
 
@@ -417,9 +484,16 @@ static int setup_interfaces(int skfd, char *ifname, char *args[], int count)
 	if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
 		return 0;
 
-	setup_bcom(skfd, ifname);
-	setup_wext(skfd, ifname);
-	start_bcom(skfd, ifname);
+	if (strncmp(ifname, "ath", 3) == 0) {
+		set_wext_mode(skfd, ifname);
+		setup_wext(skfd, ifname);
+	} else {
+		stop_bcom(skfd, ifname);
+		set_wext_mode(skfd, ifname);
+		setup_bcom(skfd, ifname);
+		setup_wext(skfd, ifname);
+	}
+	
 	prefix[2]++;
 }