X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/11cdd8c18e72bf10191cbea26f5f3edccdd819f1..7e450a1c869a5b227e3c91c4e71049059f1193e6:/package/broadcom-wl/files/lib/wifi/broadcom.sh?ds=inline

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 27d9ca6be..bc3a1f371 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -2,7 +2,9 @@ append DRIVERS "broadcom"
 
 scan_broadcom() {
 	local device="$1"
-	local wds=
+	local wds
+	local adhoc sta apmode
+	local adhoc_if sta_if ap_if
 
 	config_get vifs "$device" vifs
 	for vif in $vifs; do
@@ -17,7 +19,7 @@ scan_broadcom() {
 				sta_if="$vif"
 			;;
 			ap)
-				ap=1
+				apmode=1
 				ap_if="${ap_if:+$ap_if }$vif"
 			;;
 			wds)
@@ -34,6 +36,7 @@ scan_broadcom() {
 		config_set "$vif" ifname "wl0${_c:+.$_c}"
 		_c=$((${_c:-0} + 1))
 	done
+	config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if}"
 
 	ifdown="down"
 	for vif in 0 1 2 3; do
@@ -46,7 +49,7 @@ scan_broadcom() {
 	mssid=1
 	apsta=0
 	radio=1
-	case "$adhoc:$sta:$ap" in
+	case "$adhoc:$sta:$apmode" in
 		1*)
 			ap=0
 			mssid=0
@@ -88,20 +91,35 @@ enable_broadcom() {
 	config_get country "$device" country
 	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
+	local vif_pre_up vif_post_up vif_do_up
 
 	_c=0
 	nas="$(which nas)"
 	nas_cmd=
 	if_up=
-	for vif in ${adhoc_if:-$sta_if $ap_if}; do
+
+	[ -z "$slottime" ] && {
+		[ -n "$distance" ] && {
+			# slottime = 9 + (distance / 150) + (distance % 150 ? 1 : 0)
+			slottime="$((9 + ($distance / 150) + 1 - (150 - ($distance % 150)) / 150 ))"
+		}
+	} || {
+		slottime="${slottime:--1}"
+	}
+
+	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" ] || {
+		[ "$mode" = "sta" ] || {
 			config_get_bool hidden "$vif" hidden 1
 			append vif_pre_up "closed $hidden" "$N"
 			config_get_bool isolate "$vif" isolate
-			append vif_pre_up "ap_isolate $hidden" "$N"
+			append vif_pre_up "ap_isolate $isolate" "$N"
 		}
 
 		wsec_r=0
@@ -113,13 +131,29 @@ 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;;
+					*) auth=4; wsec=2;;
 				esac
 				eval "${vif}_key=\"\$key\""
 				nasopts="-k \"\$${vif}_key\""
@@ -132,7 +166,7 @@ enable_broadcom() {
 				config_get port "$vif" port
 				case "$enc" in
 					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"
@@ -144,12 +178,17 @@ 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"
+		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"
+		local net_cfg bridge
 		net_cfg="$(find_net_config "$vif")"
 		[ -z "$net_cfg" ] || {
 			bridge="$(bridge_interface "$net_cfg")"
@@ -159,7 +198,7 @@ enable_broadcom() {
 			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 &"
+			[ -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 $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
 		}
 		_c=$(($_c + 1))
 	done
@@ -167,25 +206,31 @@ enable_broadcom() {
 	wlc stdin <<EOF
 $ifdown
 
-mssid $mssid
 ap $ap
+mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
+802.11d 0
+802.11h 0
 
 radio ${radio:-1}
 macfilter 0
 maclist none
 wds ${wds:-none}
-channel ${channel:-0}
+${channel:+channel $channel}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}
+slottime ${slottime:--1}
 
 $vif_pre_up
 up
 $vif_post_up
 EOF
 	eval "$if_up"
+	wlc stdin <<EOF
+$vif_do_up
+EOF
 	eval "$nas_cmd"
 }