package/fuse: add workaround for uClibc 0.9.29 issues, fixes owfs and possibly others

[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 3562455..e0d741b 100644 (file)
--- 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
 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
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
                config_get mode "$vif" mode

+               _c=$(($_c + 1))

                case "$mode" in
                        adhoc)
                                adhoc=1
                case "$mode" in
                        adhoc)
                                adhoc=1


@@ -24,7 +26,14 @@ scan_broadcom() {
                        ;;
                        wds)
                                config_get addr "$vif" bssid
                        ;;
                        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
                        ;;
                        *) echo "$device($vif): Invalid mode";;
                esac


@@ -32,11 +41,11 @@ scan_broadcom() {
        config_set "$device" wds "$wds"
 
        local _c=
        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 "$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
 
        ifdown="down"
        for vif in 0 1 2 3; do


@@ -46,23 +55,36 @@ scan_broadcom() {
 
        ap=1
        infra=1
 
        ap=1
        infra=1

-       mssid=1
+       if [ "$_c" -gt 1 ]; then
+               mssid=1
+       else
+               mssid=
+       fi

        apsta=0
        radio=1
        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*)
                        ap=0
                        mssid=
                        infra=0
                ;;

-               :1:1)
+               :1:1:)

                        apsta=1
                        wet=1
                ;;
                        apsta=1
                        wet=1
                ;;

-               :1:)
+               :1::)
+                       wet=1
+                       ap=0
+                       mssid=
+               ;;
+               :::1)

                        wet=1
                        ap=0
                        mssid=
                        wet=1
                        ap=0
                        mssid=

+                       monitor=1
+                       passive=1

                ;;
                ::)
                        radio=0
                ;;
                ::)
                        radio=0


@@ -95,12 +117,13 @@ enable_broadcom() {
        config_get vifs "$device" vifs
        config_get distance "$device" distance
        config_get slottime "$device" slottime
        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
        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
+       local vif_pre_up vif_post_up vif_do_up txpower

 
        _c=0
        nas="$(which nas)"
 
        _c=0
        nas="$(which nas)"


@@ -129,9 +152,12 @@ enable_broadcom() {
        esac
 
        for vif in $vifs; do
        esac
 
        for vif in $vifs; do

+               config_get txpower "$vif" txpower
+

                config_get mode "$vif" mode
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                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"

                
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0
                
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0


@@ -189,7 +215,7 @@ enable_broadcom() {
                                        *) auth=2; wsec=2;;
                                esac
                                eval "${vif}_key=\"\$key\""
                                        *) 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"
                        ;;
                esac
                append vif_do_up "wsec $wsec" "$N"


@@ -201,11 +227,17 @@ enable_broadcom() {
                append vif_post_up "vlan_mode 0" "$N"
                append vif_post_up "ssid $ssid" "$N"
                append vif_do_up "ssid $ssid" "$N"
                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"
+               }

                
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
                #append if_up "ifconfig $ifname up" ";$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" ] || {
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {


@@ -241,8 +273,10 @@ infra $infra
 ${wet:+wet 1}
 802.11d 0
 802.11h 0
 ${wet:+wet 1}
 802.11d 0
 802.11h 0

-rxant ${rxant:-3}
-txant ${txant:-3}
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
+monitor ${monitor:-0}
+passive ${passive:-0}

 
 radio ${radio:-1}
 macfilter ${macfilter:-0}
 
 radio ${radio:-1}
 macfilter ${macfilter:-0}


@@ -263,6 +297,8 @@ EOF
        wlc stdin <<EOF
 $vif_do_up
 EOF
        wlc stdin <<EOF
 $vif_do_up
 EOF

+       [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+

        eval "$nas_cmd"
 }
 
        eval "$nas_cmd"
 }