projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 fc26d07..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
                1*)
                        ap=0
-                       mssid=0
+                       mssid=
                        infra=0
                ;;
                        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
                        wet=1
                        ap=0
-                       mssid=0
+                       mssid=
+                       monitor=1
+                       passive=1
                ;;
                ::)
                        radio=0
                ;;
                ::)
                        radio=0
@@ -71,6 +93,7 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
 }
 
 disable_broadcom() {
+       set_wifi_down "$1"
        wlc down
        (
                include /lib/network
        wlc down
        (
                include /lib/network
@@ -94,9 +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
-       local vif_pre_up vif_post_up vif_do_up
+       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 macaddr "$device" macaddr
+       local vif_pre_up vif_post_up vif_do_up txpower
 
        _c=0
        nas="$(which nas)"
 
        _c=0
        nas="$(which nas)"
@@ -111,11 +138,26 @@ enable_broadcom() {
        } || {
                slottime="${slottime:--1}"
        }
        } || {
                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
 
        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
@@ -143,11 +185,11 @@ enable_broadcom() {
                                                        config_get k "$vif" key$knr
                                                        [ -n "$k" ] || continue
                                                        [ "$defkey" = "$knr" ] && def="=" || def=""
                                                        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
                                        ;;
                                        "");;
                                                done
                                        ;;
                                        "");;
-                                       *) append vif_pre_up "wepkey =1,$key" "$N";;
+                                       *) append vif_do_up "wepkey =1,$key" "$N";;
                                esac
                        ;;
                        *psk*|*PSK*)
                                esac
                        ;;
                        *psk*|*PSK*)
@@ -173,36 +215,50 @@ 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
                        ;;
                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"
                
                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 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"
                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\""
                }
                [ -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 $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+                       nas_mode="-A"
+                       use_nas=1
+                       [ "$mode" = "sta" ] && {
+                               nas_mode="-S"
+                               [ -z "$bridge" ] || {
+                                       append vif_post_up "supplicant 1" "$N"
+                                       append vif_post_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
                }
                _c=$(($_c + 1))
        done
@@ -211,23 +267,27 @@ enable_broadcom() {
 $ifdown
 
 ap $ap
 $ifdown
 
 ap $ap
-mssid $mssid
+${mssid:+mssid $mssid}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
 802.11d 0
 802.11h 0
 apsta $apsta
 infra $infra
 ${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}
 
 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}
 country ${country:-IL0}
+${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
+${frameburst:+frameburst $frameburst}
 
 $vif_pre_up
 up
 
 $vif_pre_up
 up
@@ -237,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"
 }
 
@@ -249,7 +311,8 @@ detect_broadcom() {
 config wifi-device  wl0
        option type     broadcom
        option channel  5
 config wifi-device  wl0
        option type     broadcom
        option channel  5
-# disable radio to prevent an open ap after reflashing:
+
+       # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1
 
 config wifi-iface
        option disabled 1
 
 config wifi-iface
@@ -257,8 +320,6 @@ config wifi-iface
        option network  lan
        option mode     ap
        option ssid     OpenWrt
        option network  lan
        option mode     ap
        option ssid     OpenWrt
-       option hidden   0
        option encryption none
        option encryption none
-
 EOF
 }
 EOF
 }
Personal OpenWRT clone
This page took 0.034989 seconds and 4 git commands to generate.