projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[package] broadcom-wl: introduce "disabled" option for wifi-iface section to shutdown...
[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 435c440..f4d5213 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,21 +1,19 @@
-bridge_interface() {
-       (
-               . /etc/functions.sh
-               include network
-               scan_interfaces
-               cfg="$(find_config "$1")"
-               [ -z "$cfg" ] && return 0
-               config_get iftype "$cfg" type
-               [ "$iftype" = bridge ] && config_get "$iftype" bridge
-       )
-}
+append DRIVERS "broadcom"
 
 scan_broadcom() {
        local device="$1"
 
 scan_broadcom() {
        local device="$1"
+       local wds
+       local adhoc sta apmode mon disabled
+       local adhoc_if sta_if ap_if mon_if
+       local _c=0
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
+               config_get_bool disabled "$vif" disabled 0
+               [ $disabled -eq 0 ] || continue
+
                config_get mode "$vif" mode
                config_get mode "$vif" mode
+               _c=$(($_c + 1))
                case "$mode" in
                        adhoc)
                                adhoc=1
                case "$mode" in
                        adhoc)
                                adhoc=1
@@ -26,18 +24,31 @@ scan_broadcom() {
                                sta_if="$vif"
                        ;;
                        ap)
                                sta_if="$vif"
                        ;;
                        ap)
-                               ap=1
+                               apmode=1
                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;
                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;
+                       wds)
+                               config_get addr "$vif" bssid
+                               [ -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
        done
                        *) echo "$device($vif): Invalid mode";;
                esac
        done
+       config_set "$device" wds "$wds"
 
        local _c=
 
        local _c=
-       for vif in ${adhoc_if:-$sta_if $ap_if}; do
-               config_set "$vif" ifname "wl0${_c:+.$_c}"
+       for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
+               config_set "$vif" ifname "${device}${_c:+.$_c}"
                _c=$((${_c:-0} + 1))
        done
                _c=$((${_c:-0} + 1))
        done
+       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
@@ -47,23 +58,34 @@ 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:$ap" in
+       monitor=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
                ;;
                ::)
                        radio=0
                ;;
                ::)
                        radio=0
@@ -71,26 +93,99 @@ scan_broadcom() {
        esac
 }
 
        esac
 }
 
+disable_broadcom() {
+       local device="$1"
+       set_wifi_down "$device"
+       wlc ifname "$device" down
+       wlc ifname "$device" bssid `wlc ifname "$device" default_bssid`
+       (
+               include /lib/network
 
 
-setup_broadcom() {
+               # make sure the interfaces are down and removed from all bridges
+               for dev in $device ${device}.1 ${device}.2 ${device}.3; do
+                       ifconfig "$dev" down 2>/dev/null >/dev/null && {
+                               unbridge "$dev"
+                       }
+               done
+       )
+       true
+}
+
+enable_broadcom() {
+       local device="$1"
        local _c
        config_get channel "$device" channel
        config_get country "$device" country
        config_get maxassoc "$device" maxassoc
        local _c
        config_get channel "$device" channel
        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
+       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
+       config_get txpower "$device" txpower
+       config_get frag "$device" frag
+       config_get rts "$device" rts
+       config_get hwmode "$device" hwmode
+       local vif_pre_up vif_post_up vif_do_up vif_txpower
+       local doth=0
+       local wmm=0
 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_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}"
+       }
+
+       case "$macfilter" in
+               allow|2)
+                       macfilter=2;
+               ;;
+               deny|1)
+                       macfilter=1;
+               ;;
+               disable|none|0)
+                       macfilter=0;
+               ;;
+       esac
+
+       case "$hwmode" in
+               *b)   hwmode=0;;
+               *bg)  hwmode=1;;
+               *g)   hwmode=2;;
+               *gst) hwmode=4;;
+               *lrs) hwmode=5;;
+               *)    hwmode=1;;
+       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_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
-               
-               [ "$vif" = "$sta_if" ] || {
-                       config_get_bool hidden "$vif" hidden 1
+               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"
                        append vif_pre_up "closed $hidden" "$N"
-                       config_get_bool isolate "$vif" isolate
-                       append vif_pre_up "ap_isolate $hidden" "$N"
+                       config_get_bool isolate "$vif" isolate 0
+                       append vif_pre_up "ap_isolate $isolate" "$N"
                }
 
                wsec_r=0
                }
 
                wsec_r=0
@@ -100,78 +195,189 @@ setup_broadcom() {
                nasopts=
                config_get enc "$vif" encryption
                case "$enc" in
                nasopts=
                config_get enc "$vif" encryption
                case "$enc" in
-                       WEP|wep)
+                       *wep*)
                                wsec_r=1
                                wsec_r=1
+                               wsec=1
+                               defkey=1
+                               config_get key "$vif" key
+                               case "$enc" in
+                                       *shared*) append vif_do_up "wepauth 1" "$N";;
+                                       *) append vif_do_up "wepauth 0" "$N";;
+                               esac
+                               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_do_up "wepkey $def$knr,$k" "$N"
+                                               done
+                                       ;;
+                                       "");;
+                                       *) append vif_do_up "wepkey =1,$key" "$N";;
+                               esac
                        ;;
                        ;;
-                       *psk*|*PSK*)
+                       *psk*)
                                wsec_r=1
                                config_get key "$vif" key
                                wsec_r=1
                                config_get key "$vif" key
+
+                               # psk version + default cipher
+                               case "$enc" in
+                                       *mixed*|*psk+psk2*) auth=132; wsec=6;;
+                                       *psk2*) auth=128; wsec=4;;
+                                       *) auth=4; wsec=2;;
+                               esac
+
+                               # cipher override
                                case "$enc" in
                                case "$enc" in
-                                       wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;;
-                                       *) auth=4; crypto=2;;
+                                       *tkip+aes*|*tkip+ccmp*|*aes+tkip*|*ccmp+tkip*) wsec=6;;
+                                       *aes*|*ccmp*) wsec=4;;
+                                       *tkip*) wsec=2;;
                                esac
                                esac
+
                                eval "${vif}_key=\"\$key\""
                                nasopts="-k \"\$${vif}_key\""
                        ;;
                                eval "${vif}_key=\"\$key\""
                                nasopts="-k \"\$${vif}_key\""
                        ;;
-                       *wpa*|*WPA*)
+                       *wpa*)
                                wsec_r=1
                                eap_r=1
                                config_get key "$vif" key
                                config_get server "$vif" server
                                config_get port "$vif" port
                                wsec_r=1
                                eap_r=1
                                config_get key "$vif" key
                                config_get server "$vif" server
                                config_get port "$vif" port
+
+                               # wpa version + default cipher
                                case "$enc" in
                                case "$enc" in
-                                       wpa2*|WPA2*) auth=64; wsec=4;;
-                                       *) auth=2; crypto=2;;
+                                       *mixed*|*wpa+wpa2*) auth=66; wsec=6;;
+                                       *wpa2*) auth=64; wsec=4;;
+                                       *) auth=2; wsec=2;;
                                esac
                                esac
+
+                               # cipher override
+                               case "$enc" in
+                                       *tkip+aes*|*tkip+ccmp*|*aes+tkip*|*ccmp+tkip*) wsec=6;;
+                                       *aes*|*ccmp*) wsec=4;;
+                                       *tkip*) wsec=2;;
+                               esac
+
                                eval "${vif}_key=\"\$key\""
                                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
                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"
                append vif_post_up "ssid $ssid" "$N"
+               append vif_do_up "ssid $ssid" "$N"
+
+               [ "$mode" = "monitor" ] && {
+                       append vif_post_up "monitor $monitor" "$N"
+               }
+
+               [ "$mode" = "adhoc" ] && {
+                       config_get bssid "$vif" bssid
+                       [ -n "$bssid" ] && {
+                               append vif_pre_up "bssid $bssid" "$N"
+                               append vif_pre_up "ibss_merge 0" "$N"
+                       } || {
+                               append vif_pre_up "ibss_merge 1" "$N"
+                       }
+               }
+
                append vif_post_up "enabled 1" "$N"
                append vif_post_up "enabled 1" "$N"
-               
+
                config_get ifname "$vif" ifname
                config_get ifname "$vif" ifname
-               append if_up "ifconfig $ifname up" ";$N"
+               #append if_up "ifconfig $ifname up" ";$N"
+
+               local net_cfg
+               net_cfg="$(find_net_config "$vif")"
+               [ -z "$net_cfg" ] || {
+                       append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
+                       append if_up "start_net '$ifname' '$net_cfg'" ";$N"
+               }
                [ -z "$nasopts" ] || {
                [ -z "$nasopts" ] || {
-                       bridge="$(bridge_interface "$ifname")"
                        eval "${vif}_ssid=\"\$ssid\""
                        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 &"
+                       nas_mode="-A"
+                       [ "$mode" = "sta" ] && nas_mode="-S"
+                       [ -z "$nas" ] || {
+                               nas_cmd="${nas_cmd:+$nas_cmd$N}start-stop-daemon -S -b -p /var/run/nas.$ifname.pid -x $nas -- -P /var/run/nas.$ifname.pid -H 34954 -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 -F $nasopts"
+                       }
                }
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-
                }
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-
-       wlc stdin <<EOF
+       wlc ifname "$device" stdin <<EOF
 $ifdown
 
 $ifdown
 
-mssid $mssid
-ap $ap
+gmode ${hwmode:-1}
 apsta $apsta
 apsta $apsta
+ap $ap
+${mssid:+mssid $mssid}
 infra $infra
 ${wet:+wet 1}
 infra $infra
 ${wet:+wet 1}
+802.11d 0
+802.11h ${doth:-0}
+wme ${wmm:-0}
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
+fragthresh ${frag:-2346}
+rtsthresh ${rts:-2347}
+monitor ${monitor:-0}
 
 radio ${radio:-1}
 
 radio ${radio:-1}
-macfilter 0
-maclist none
+macfilter ${macfilter:-0}
+maclist ${maclist:-none}
 wds none
 wds none
-channel ${channel:-0}
-country ${country:-IL0}
+${wds:+wds $wds}
+country ${country:-US}
+${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 maxassoc ${maxassoc:-128}
+slottime ${slottime:--1}
+${frameburst:+frameburst $frameburst}
 
 $vif_pre_up
 up
 $vif_post_up
 EOF
 
 $vif_pre_up
 up
 $vif_post_up
 EOF
-       eval "$nas_cmd"
        eval "$if_up"
        eval "$if_up"
+       wlc ifname "$device" 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"
 }
 
 
 }
 
 
+detect_broadcom() {
+       local i=-1
+
+       while grep -qs "^ *wl$((++i)):" /proc/net/dev; do
+               config_get type wl${i} type
+               [ "$type" = broadcom ] && continue
+               cat <<EOF
+config wifi-device  wl${i}
+       option type     broadcom
+       option channel  11
+
+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
+
+config wifi-iface
+       option device   wl${i}
+       option network  lan
+       option mode     ap
+       option ssid     OpenWrt${i#0}
+       option encryption none
+
+EOF
+       done
+}
Personal OpenWRT clone
This page took 0.030676 seconds and 4 git commands to generate.