X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8d00b42964662d768a1d86e100eb473f8de4f768..7a646a978cf3be6f640861a667ac00d736ec6f4e:/package/broadcom-wl/files/lib/wifi/broadcom.sh?ds=sidebyside

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 3562455aa..985100f6f 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -3,12 +3,14 @@ append DRIVERS "broadcom"
 scan_broadcom() {
 	local device="$1"
 	local wds
-	local adhoc sta apmode
-	local adhoc_if sta_if ap_if
+	local adhoc sta apmode mon
+	local adhoc_if sta_if ap_if mon_if
+	local _c=0
 
 	config_get vifs "$device" vifs
 	for vif in $vifs; do
 		config_get mode "$vif" mode
+		_c=$(($_c + 1))
 		case "$mode" in
 			adhoc)
 				adhoc=1
@@ -24,7 +26,14 @@ scan_broadcom() {
 			;;
 			wds)
 				config_get addr "$vif" bssid
-				[ -z "$addr" ] || append wds "$addr"
+				[ -z "$addr" ] || {
+					addr=$(echo "$addr" | tr 'A-F' 'a-f')
+					append wds "$addr"
+				}
+			;;
+			monitor)
+				mon=1
+				mon_if="$vif"
 			;;
 			*) echo "$device($vif): Invalid mode";;
 		esac
@@ -32,11 +41,11 @@ scan_broadcom() {
 	config_set "$device" wds "$wds"
 
 	local _c=
-	for vif in ${adhoc_if:-$sta_if $ap_if}; do
+	for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
 		config_set "$vif" ifname "wl0${_c:+.$_c}"
 		_c=$((${_c:-0} + 1))
 	done
-	config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if}"
+	config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
 
 	ifdown="down"
 	for vif in 0 1 2 3; do
@@ -46,24 +55,37 @@ scan_broadcom() {
 
 	ap=1
 	infra=1
-	mssid=1
+	if [ "$_c" -gt 1 ]; then
+		mssid=1
+	else
+		mssid=
+	fi
 	apsta=0
 	radio=1
-	case "$adhoc:$sta:$apmode" in
+	monitor=0
+	passive=0
+	case "$adhoc:$sta:$apmode:$mon" in
 		1*)
 			ap=0
 			mssid=
 			infra=0
 		;;
-		:1:1)
+		:1:1:)
 			apsta=1
 			wet=1
 		;;
-		:1:)
+		:1::)
 			wet=1
 			ap=0
 			mssid=
 		;;
+		:::1)
+			wet=1
+			ap=0
+			mssid=
+			monitor=1
+			passive=1
+		;;
 		::)
 			radio=0
 		;;
@@ -95,12 +117,16 @@ enable_broadcom() {
 	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 rxantenna "$device" rxantenna
+	config_get txantenna "$device" txantenna
 	config_get_bool frameburst "$device" frameburst
 	config_get macfilter "$device" macfilter
 	config_get maclist "$device" maclist
-	local vif_pre_up vif_post_up vif_do_up
+	config_get macaddr "$device" macaddr
+	config_get txpower "$device" txpower
+	local vif_pre_up vif_post_up vif_do_up vif_txpower
+	local doth=0
+	local wmm=0
 
 	_c=0
 	nas="$(which nas)"
@@ -115,7 +141,7 @@ enable_broadcom() {
 	} || {
 		slottime="${slottime:--1}"
 	}
-	
+
 	case "$macfilter" in
 		allow|2)
 			macfilter=2;
@@ -129,10 +155,16 @@ enable_broadcom() {
 	esac
 
 	for vif in $vifs; do
+		config_get vif_txpower "$vif" txpower
+
 		config_get mode "$vif" mode
 		append vif_pre_up "vif $_c" "$N"
 		append vif_post_up "vif $_c" "$N"
-		
+		append vif_do_up "vif $_c" "$N"
+
+		config_get_bool wmm "$vif" wmm "$wmm"
+		config_get_bool doth "$vif" doth "$doth"
+
 		[ "$mode" = "sta" ] || {
 			config_get_bool hidden "$vif" hidden 0
 			append vif_pre_up "closed $hidden" "$N"
@@ -172,6 +204,7 @@ enable_broadcom() {
 				case "$enc" in
 					wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;;
 					wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;;
+					*aes|*AES) auth=4; wsec=4;;
 					*) auth=4; wsec=2;;
 				esac
 				eval "${vif}_key=\"\$key\""
@@ -189,7 +222,7 @@ enable_broadcom() {
 					*) auth=2; wsec=2;;
 				esac
 				eval "${vif}_key=\"\$key\""
-				nasopts="-r \"\$${vif}_key\" -h $server -p $port"
+				nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"
 			;;
 		esac
 		append vif_do_up "wsec $wsec" "$N"
@@ -201,17 +234,31 @@ enable_broadcom() {
 		append vif_post_up "vlan_mode 0" "$N"
 		append vif_post_up "ssid $ssid" "$N"
 		append vif_do_up "ssid $ssid" "$N"
+
+		[ "$mode" = "monitor" ] && {
+			append vif_post_up "monitor $monitor" "$N"
+			append vif_post_up "passive $passive" "$N"
+		}
+
+		[ "$mode" = "adhoc" ] && {
+			config_get bssid "$vif" bssid
+			[ -n "$bssid" ] && {
+				append vif_pre_up "des_bssid $bssid" "$N"
+				append vif_pre_up "allow_mode 1" "$N"
+			}
+		} || append vif_pre_up "allow_mode 0" "$N"
 		
 		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")"
-			append if_up "start_net '$ifname' '$net_cfg'" ";$N"
 			append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
+			append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N"
 		}
 		[ -z "$nasopts" ] || {
 			eval "${vif}_ssid=\"\$ssid\""
@@ -234,15 +281,18 @@ enable_broadcom() {
 	wlc stdin <<EOF
 $ifdown
 
+apsta $apsta
 ap $ap
 ${mssid:+mssid $mssid}
-apsta $apsta
 infra $infra
 ${wet:+wet 1}
 802.11d 0
-802.11h 0
-rxant ${rxant:-3}
-txant ${txant:-3}
+802.11h ${doth:-0}
+wme ${wmm:-0}
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
+monitor ${monitor:-0}
+passive ${passive:-0}
 
 radio ${radio:-1}
 macfilter ${macfilter:-0}
@@ -263,6 +313,12 @@ EOF
 	wlc stdin <<EOF
 $vif_do_up
 EOF
+
+	# use vif_txpower (from last wifi-iface) instead of txpower (from
+	# wifi-device) if the latter does not exist
+	txpower=${txpower:-$vif_txpower}
+	[ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm
+
 	eval "$nas_cmd"
 }