X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9c3919ac1ee1a379eb9d344fb196f915599f4c39..aea7a72fb9fe9c86010022366fba33c66a06514a:/package/broadcom-wl/files/lib/wifi/broadcom.sh

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 9fed98f81..f52e9b0d7 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -71,6 +71,7 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
+	set_wifi_down "$1"
 	wlc down
 	(
 		include /lib/network
@@ -92,21 +93,50 @@ enable_broadcom() {
 	config_get maxassoc "$device" maxassoc
 	config_get wds "$device" wds
 	config_get vifs "$device" vifs
+	config_get distance "$device" distance
+	config_get slottime "$device" slottime
+	config_get rxant "$device" rxant
+	config_get txant "$device" txant
+	config_get macfilter "$device" macfilter
+	config_get maclist "$device" maclist
 	local vif_pre_up vif_post_up vif_do_up
 
 	_c=0
 	nas="$(which nas)"
 	nas_cmd=
 	if_up=
+
+	[ -z "$slottime" ] && {
+		[ -n "$distance" ] && {
+			# slottime = 9 + (distance / 150) + (distance % 150 ? 1 : 0)
+			slottime="$((9 + ($distance / 150) + 1 - (150 - ($distance % 150)) / 150 ))"
+		}
+	} || {
+		slottime="${slottime:--1}"
+	}
+	
+	case "$macfilter" in
+		allow|2)
+			macfilter=2;
+		;;
+		deny|1)
+			macfilter=1;
+		;;
+		disable|none|0)
+			macfilter=0;
+		;;
+	esac
+
 	for vif in $vifs; do
+		config_get mode "$vif" mode
 		append vif_pre_up "vif $_c" "$N"
 		append vif_post_up "vif $_c" "$N"
 		
-		[ "$vif" = "$sta_if" ] || {
-			config_get_bool hidden "$vif" hidden 1
+		[ "$mode" = "sta" ] || {
+			config_get_bool hidden "$vif" hidden 0
 			append vif_pre_up "closed $hidden" "$N"
-			config_get_bool isolate "$vif" isolate
-			append vif_pre_up "ap_isolate $hidden" "$N"
+			config_get_bool isolate "$vif" isolate 0
+			append vif_pre_up "ap_isolate $isolate" "$N"
 		}
 
 		wsec_r=0
@@ -118,13 +148,30 @@ enable_broadcom() {
 		case "$enc" in
 			WEP|wep)
 				wsec_r=1
+				wsec=1
+				defkey=1
+				config_get key "$vif" key
+				case "$key" in
+					[1234])
+						defkey="$key"
+						for knr in 1 2 3 4; do
+							config_get k "$vif" key$knr
+							[ -n "$k" ] || continue
+							[ "$defkey" = "$knr" ] && def="=" || def=""
+							append vif_pre_up "wepkey $def$knr,$k" "$N"
+						done
+					;;
+					"");;
+					*) append vif_pre_up "wepkey =1,$key" "$N";;
+				esac
 			;;
 			*psk*|*PSK*)
 				wsec_r=1
 				config_get key "$vif" key
 				case "$enc" in
-					wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;
-					*) auth=4; crypto=2;;
+					wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;;
+					wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;;
+					*) auth=4; wsec=2;;
 				esac
 				eval "${vif}_key=\"\$key\""
 				nasopts="-k \"\$${vif}_key\""
@@ -136,8 +183,9 @@ enable_broadcom() {
 				config_get server "$vif" server
 				config_get port "$vif" port
 				case "$enc" in
+					wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;;
 					wpa2*|WPA2*) auth=64; wsec=4;;
-					*) auth=2; crypto=2;;
+					*) auth=2; wsec=2;;
 				esac
 				eval "${vif}_key=\"\$key\""
 				nasopts="-r \"\$${vif}_key\" -h $server -p $port"
@@ -149,25 +197,37 @@ enable_broadcom() {
 		append vif_post_up "eap_restrict $eap_r" "$N"
 		
 		config_get ssid "$vif" ssid
-		append vif_post_up "vlan_mode 0"
+		append vif_post_up "vlan_mode 0" "$N"
 		append vif_post_up "ssid $ssid" "$N"
-		[ "$wet" = 1 -o "$apsta" = 1 -o "$ap" = 0 -o "$infra" = 0 ] && \
-			append vif_do_up "ssid $ssid" "$N"
+		case "$mode" in
+			sta|adhoc) append vif_do_up "ssid $ssid" "$N";;
+		esac
 		
 		append vif_post_up "enabled 1" "$N"
 		
 		config_get ifname "$vif" ifname
-		append if_up "ifconfig $ifname up" ";$N"
+		#append if_up "ifconfig $ifname up" ";$N"
+		local net_cfg bridge
 		net_cfg="$(find_net_config "$vif")"
 		[ -z "$net_cfg" ] || {
 			bridge="$(bridge_interface "$net_cfg")"
 			append if_up "start_net '$ifname' '$net_cfg'" ";$N"
+			append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
 		}
 		[ -z "$nasopts" ] || {
 			eval "${vif}_ssid=\"\$ssid\""
-			mode="-A"
-			[ "$vif" = "$sta_if" ] && mode="-S"
-			[ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $mode -m $auth -w $crypto -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+			nas_mode="-A"
+			use_nas=1
+			[ "$mode" = "sta" ] && {
+				nas_mode="-S"
+				[ -z "$bridge" ] || {
+					append vif_pre_up "supplicant 1" "$N"
+					append vif_pre_up "passphrase $key" "$N"
+					
+					use_nas=0
+				}
+			}
+			[ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
 		}
 		_c=$(($_c + 1))
 	done
@@ -180,14 +240,20 @@ mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
+802.11d 0
+802.11h 0
+rxant ${rxant:-3}
+txant ${txant:-3}
 
 radio ${radio:-1}
-macfilter 0
-maclist none
-wds ${wds:-none}
-channel ${channel:-0}
+macfilter ${macfilter:-0}
+maclist ${maclist:-none}
+wds none
+${wds:+wds $wds}
+${channel:+channel $channel}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}
+slottime ${slottime:--1}
 
 $vif_pre_up
 up
@@ -210,12 +276,14 @@ config wifi-device  wl0
 	option type     broadcom
 	option channel  5
 
+	# REMOVE THIS LINE TO ENABLE WIFI:
+	option disabled 1
+
 config wifi-iface
 	option device   wl0
+	option network	lan
 	option mode     ap
 	option ssid     OpenWrt
-	option hidden   0
 	option encryption none
-
 EOF
 }