X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbroadcom-wl%2Ffiles%2Flib%2Fwifi%2Fbroadcom.sh;h=72b85aaf88bde7f4243895cddca94b73c46ea0b7;hb=44b1688e6c7b4f16f7165fbd560e1183aef69090;hp=3a8bebd176436597bec7459893bd81408018a328;hpb=6fe53385914e2004145455430d0282ace3c84ddf;p=openwrt%2Fstaging%2Fwigyori.git diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh index 3a8bebd176..72b85aaf88 100644 --- a/package/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh @@ -3,12 +3,17 @@ 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 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_bool disabled "$vif" disabled 0 + [ $disabled -eq 0 ] || continue + config_get mode "$vif" mode + _c=$(($_c + 1)) case "$mode" in adhoc) adhoc=1 @@ -24,7 +29,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 +44,11 @@ scan_broadcom() { config_set "$device" wds "$wds" 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 - 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,23 +58,34 @@ 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 + 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 ;; ::) radio=0 @@ -71,12 +94,15 @@ scan_broadcom() { } disable_broadcom() { - wlc down + local device="$1" + set_wifi_down "$device" + wlc ifname "$device" down + wlc ifname "$device" bssid `wlc ifname "$device" default_bssid` ( include /lib/network # make sure the interfaces are down and removed from all bridges - for dev in wl0 wl0.1 wl0.2 wl0.3; do + for dev in $device ${device}.1 ${device}.2 ${device}.3; do ifconfig "$dev" down 2>/dev/null >/dev/null && { unbridge "$dev" } @@ -86,6 +112,7 @@ disable_broadcom() { } enable_broadcom() { + local device="$1" local _c config_get channel "$device" channel config_get country "$device" country @@ -94,9 +121,19 @@ 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 - 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 + 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=1 _c=0 nas="$(which nas)" @@ -112,11 +149,38 @@ enable_broadcom() { 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_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" @@ -131,11 +195,15 @@ enable_broadcom() { nasopts= config_get enc "$vif" encryption case "$enc" in - WEP|wep) + *wep*) 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" @@ -143,131 +211,185 @@ 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*) + *psk*) wsec_r=1 config_get key "$vif" key + + # psk version + default cipher case "$enc" in - wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;; - wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;; + *mixed*|*psk+psk2*) auth=132; wsec=6;; + *psk2*) auth=128; wsec=4;; *) auth=4; wsec=2;; esac + + # cipher override + case "$enc" in + *tkip+aes*|*tkip+ccmp*|*aes+tkip*|*ccmp+tkip*) wsec=6;; + *aes*|*ccmp*) wsec=4;; + *tkip*) wsec=2;; + esac + + # group rekey interval + config_get rekey "$vif" wpa_group_rekey + eval "${vif}_key=\"\$key\"" - nasopts="-k \"\$${vif}_key\"" + nasopts="-k \"\$${vif}_key\"${rekey:+ -g $rekey}" ;; - *wpa*|*WPA*) + *wpa*) wsec_r=1 eap_r=1 - config_get key "$vif" key - config_get server "$vif" server - config_get port "$vif" port + config_get auth_server "$vif" auth_server + [ -z "$auth_server" ] && config_get auth_server "$vif" server + config_get auth_port "$vif" auth_port + [ -z "$auth_port" ] && config_get auth_port "$vif" port + config_get auth_secret "$vif" auth_secret + [ -z "$auth_secret" ] && config_get auth_secret "$vif" key + + # wpa version + default cipher case "$enc" in - wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;; - wpa2*|WPA2*) auth=64; wsec=4;; + *mixed*|*wpa+wpa2*) auth=66; wsec=6;; + *wpa2*) auth=64; wsec=4;; *) auth=2; wsec=2;; esac - eval "${vif}_key=\"\$key\"" - nasopts="-r \"\$${vif}_key\" -h $server -p $port" + + # cipher override + case "$enc" in + *tkip+aes*|*tkip+ccmp*|*aes+tkip*|*ccmp+tkip*) wsec=6;; + *aes*|*ccmp*) wsec=4;; + *tkip*) wsec=2;; + esac + + # group rekey interval + config_get rekey "$vif" wpa_group_rekey + + eval "${vif}_key=\"\$auth_secret\"" + nasopts="-r \"\$${vif}_key\" -h $auth_server -p ${auth_port:-1812}${rekey:+ -g $rekey}" ;; 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" + } + + [ "$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" - + config_get ifname "$vif" ifname #append if_up "ifconfig $ifname up" ";$N" - local net_cfg bridge + + local net_cfg net_cfg="$(find_net_config "$vif")" [ -z "$net_cfg" ] || { - bridge="$(bridge_interface "$net_cfg")" + append if_up "set_wifi_up '$vif' '$ifname'" ";$N" append if_up "start_net '$ifname' '$net_cfg'" ";$N" } [ -z "$nasopts" ] || { eval "${vif}_ssid=\"\$ssid\"" nas_mode="-A" - use_nas=1 - [ "$mode" = "sta" ] && { - nas_mode="-S" - [ -z "$bridge" ] || { - append vif_pre_up "supplicant 1" "$N" - append vif_pre_up "passphrase $key" "$N" - - use_nas=0 - } + [ "$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" } - [ -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 killall -KILL nas >&- 2>&- - wlc stdin <