X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e3da57af06b13f5d4d93de48cc1a01a90de610b0..1c79b1465da207c0d60b866b7fe991a5e1a7b8ce:/openwrt/package/wificonf/wificonf.c

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 21a96c46f..7a9cde5a1 100644
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -36,21 +36,18 @@
 	do { \
 		ERR_SET_EXT(rname, request); \
 		fprintf(stderr, "    too few arguments.\n"); \
-		return; \
 	} while(0)
 
 #define ABORT_ARG_TYPE(rname, request, arg) \
 	do { \
 		ERR_SET_EXT(rname, request); \
 		fprintf(stderr, "    invalid argument \"%s\".\n", arg); \
-		return; \
 	} while(0)
 
 #define ABORT_ARG_SIZE(rname, request, max) \
 	do { \
 		ERR_SET_EXT(rname, request); \
 		fprintf(stderr, "    argument too big (max %d)\n", max); \
-		return; \
 	} while(0)
 
 /*------------------------------------------------------------------*/
@@ -64,7 +61,6 @@
 		ERR_SET_EXT(rname, request); \
 		fprintf(stderr, "    SET failed on device %-1.16s ; %s.\n", \
 			ifname, strerror(errno)); \
-		return; \
 	} } while(0)
 
 /*------------------------------------------------------------------*/
@@ -78,7 +74,6 @@
 		ERR_SET_EXT(rname, request); \
 		fprintf(stderr, "    GET failed on device %-1.16s ; %s.\n", \
 			ifname, strerror(errno)); \
-		return; \
 	} } while(0)
 
 char *prefix;
@@ -115,8 +110,6 @@ int bcom_ioctl(int skfd, char *ifname, int cmd, void *buf, int len)
 	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
 
 	ret = ioctl(skfd, SIOCDEVPRIVATE, &ifr);
-	if (ret < 0)
-		fprintf(stderr, "bcom_ioctl [cmd=%d, buf=%08x, len=%d] failed: %d\n", cmd, buf, len, ret);
 
 	return ret;
 }
@@ -146,6 +139,8 @@ int bcom_set_int(int skfd, char *ifname, char *var, int val)
 void setup_bcom(int skfd, char *ifname)
 {
 	int val = 0;
+	char buf[8192];
+	char wbuf[80];
 	char *v;
 	
 	if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
@@ -153,20 +148,22 @@ void setup_bcom(int skfd, char *ifname)
 
 	bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
 	
-	/* 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));
+	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));
+		}
 	}
 
 	/* Set up afterburner */
@@ -225,8 +222,6 @@ void setup_bcom(int skfd, char *ifname)
 		val = WLC_MACMODE_DISABLED;
 
 	if ((val != WLC_MACMODE_DISABLED) && (v = nvram_get(wl_var("maclist")))) {
-		char buf[8192];
-		char wbuf[80];
 		struct maclist *mac_list;
 		struct ether_addr *addr;
 		char *next;
@@ -235,7 +230,7 @@ void setup_bcom(int skfd, char *ifname)
 		mac_list = (struct maclist *) buf;
 		addr = mac_list->ea;
 		
-		foreach(wbuf, nvram_safe_get(wl_var("maclist")), next) {
+		foreach(wbuf, v, next) {
 			if (ether_atoe(wbuf, addr->ether_addr_octet)) {
 				mac_list->count++;
 				addr++;
@@ -246,6 +241,21 @@ void setup_bcom(int skfd, char *ifname)
 		val = WLC_MACMODE_DISABLED;
 	}
 	bcom_ioctl(skfd, ifname, WLC_SET_MACMODE, &val, sizeof(val));
+
+	if (v = nvram_get(wl_var("wds"))) {
+		struct maclist *wdslist = (struct maclist *) buf;
+		struct ether_addr *addr = wdslist->ea;
+		char *next;
+
+		memset(buf, 0, 8192);
+		foreach(wbuf, v, next) {
+			if (ether_atoe(wbuf, addr->ether_addr_octet)) {
+				wdslist->count++;
+				addr++;
+			}
+		}
+		bcom_ioctl(skfd, ifname, WLC_SET_WDSLIST, buf, sizeof(buf));
+	}
 	
 	/* Set up G mode */
 	bcom_ioctl(skfd, ifname, WLC_GET_PHYTYPE, &val, sizeof(val));
@@ -253,9 +263,14 @@ void setup_bcom(int skfd, char *ifname)
 		int override = WLC_G_PROTECTION_OFF;
 		int control = WLC_G_PROTECTION_CTL_OFF;
 		
-		val = atoi(nvram_safe_get(wl_var("gmode")));
+		if (v = nvram_get(wl_var("gmode"))) 
+			val = atoi(v);
+		else
+			val = 1;
+
 		if (val > 5)
 			val = 1;
+
 		bcom_ioctl(skfd, ifname, WLC_SET_GMODE, &val, sizeof(val));
 		
 		if (nvram_match(wl_var("gmode_protection"), "auto")) {
@@ -268,7 +283,17 @@ void setup_bcom(int skfd, char *ifname)
 		}
 		bcom_ioctl(skfd, ifname, WLC_SET_GMODE_PROTECTION_CONTROL, &override, sizeof(control));
 		bcom_ioctl(skfd, ifname, WLC_SET_GMODE_PROTECTION_OVERRIDE, &override, sizeof(override));
+
+		if (val = 0) {
+			if (nvram_match(wl_var("plcphdr"), "long"))
+				val = WLC_PLCP_AUTO;
+			else
+				val = WLC_PLCP_SHORT;
+
+			bcom_ioctl(skfd, ifname, WLC_SET_PLCPHDR, &val, sizeof(val));
+		}
 	}
+
 }
 
 void set_wext_ssid(int skfd, char *ifname)
@@ -371,7 +396,7 @@ void setup_wext(int skfd, char *ifname)
 
 	wrq.u.txpower.value = -1;
 	wrq.u.txpower.fixed = 1;
-	wrq.u.txpower.flags = IW_TXPOW_MWATT;
+	wrq.u.txpower.flags = IW_TXPOW_DBM;
 	IW_SET_EXT_ERR(skfd, ifname, SIOCSIWTXPOW, &wrq, "Set Tx Power");
 
 	/* Set up WEP */