Make sure we will have lower case MAC addresses when doing WDS

[openwrt.git] / 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 8b02125..e236a06 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -3,8 +3,8 @@ 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
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
@@ -24,7 +24,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 +39,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
@@ -49,20 +56,29 @@ scan_broadcom() {
        mssid=1
        apsta=0
        radio=1
-       case "$adhoc:$sta:$apmode" in
+       monitor=0
+       passive=0
+       case "$adhoc:$sta:$apmode:$mon" in
                1*)
                        ap=0
-                       mssid=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=0
+                       mssid=
+                       monitor=1
+                       passive=1
                ;;
                ::)
                        radio=0
@@ -71,6 +87,7 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
+       set_wifi_down "$1"
        wlc down
        (
                include /lib/network
@@ -96,6 +113,9 @@ enable_broadcom() {
        config_get slottime "$device" slottime
        config_get rxant "$device" rxant
        config_get txant "$device" txant
+       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
 
        _c=0
@@ -111,6 +131,18 @@ enable_broadcom() {
        } || {
                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
@@ -143,11 +175,11 @@ enable_broadcom() {
                                                        config_get k "$vif" key$knr
                                                        [ -n "$k" ] || continue
                                                        [ "$defkey" = "$knr" ] && def="=" || def=""
-                                                       append vif_pre_up "wepkey $def$knr,$k" "$N"
+                                                       append vif_do_up "wepkey $def$knr,$k" "$N"
                                                done
                                        ;;
                                        "");;
-                                       *) append vif_pre_up "wepkey =1,$key" "$N";;
+                                       *) append vif_do_up "wepkey =1,$key" "$N";;
                                esac
                        ;;
                        *psk*|*PSK*)
@@ -173,30 +205,34 @@ 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_post_up "wsec $wsec" "$N"
-               append vif_post_up "wpa_auth $auth" "$N"
-               append vif_post_up "wsec_restrict $wsec_r" "$N"
-               append vif_post_up "eap_restrict $eap_r" "$N"
+               append vif_do_up "wsec $wsec" "$N"
+               append vif_do_up "wpa_auth $auth" "$N"
+               append vif_do_up "wsec_restrict $wsec_r" "$N"
+               append vif_do_up "eap_restrict $eap_r" "$N"
                
                config_get ssid "$vif" ssid
                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_do_up "ssid $ssid" "$N"
+
+               [ "$mode" = "monitor" ] && {
+                       append vif_post_up "monitor $monitor" "$N"
+                       append vif_post_up "passive $passive" "$N"
+               }
                
                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\""
@@ -205,8 +241,8 @@ enable_broadcom() {
                        [ "$mode" = "sta" ] && {
                                nas_mode="-S"
                                [ -z "$bridge" ] || {
-                                       append vif_pre_up "supplicant 1" "$N"
-                                       append vif_pre_up "passphrase $key" "$N"
+                                       append vif_post_up "supplicant 1" "$N"
+                                       append vif_post_up "passphrase $key" "$N"
                                        
                                        use_nas=0
                                }
@@ -220,7 +256,7 @@ enable_broadcom() {
 $ifdown
 
 ap $ap
-mssid $mssid
+${mssid:+mssid $mssid}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
@@ -228,15 +264,19 @@ ${wet:+wet 1}
 802.11h 0
 rxant ${rxant:-3}
 txant ${txant:-3}
+monitor ${monitor:-0}
+passive ${passive:-0}
 
 radio ${radio:-1}
-macfilter 0
-maclist none
-wds ${wds:-none}
-${channel:+channel $channel}
+macfilter ${macfilter:-0}
+maclist ${maclist:-none}
+wds none
+${wds:+wds $wds}
 country ${country:-IL0}
+${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
+${frameburst:+frameburst $frameburst}
 
 $vif_pre_up
 up