X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2Ffiles%2Flib%2Fwifi%2Fmadwifi.sh;h=be4cad0b704e76fc606126c9400140991d7eb569;hb=cda50e23c5a222f57ec68f8ae8b06a4c0b806840;hp=46f994ea74c953306f7d8c129bf851ee8a188afe;hpb=cb0f299275af08b2d6c714f96aacae3948e79991;p=openwrt.git diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 46f994ea74..be4cad0b70 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -14,7 +14,7 @@ scan_atheros() { config_get mode "$vif" mode case "$mode" in - adhoc|ahdemo|sta|ap) + adhoc|ahdemo|sta|ap|monitor) append $mode "$vif" ;; wds) @@ -43,13 +43,14 @@ scan_atheros() { *) echo "$device: Invalid mode combination in config"; return 1;; esac - config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }" + config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}" } disable_atheros() ( local device="$1" + set_wifi_down "$device" # kill all running hostapd and wpa_supplicant processes that # are running on atheros vifs for pid in `pidof hostapd wpa_supplicant`; do @@ -70,10 +71,12 @@ disable_atheros() ( ) enable_atheros() { + local device="$1" config_get channel "$device" channel config_get vifs "$device" vifs - - disable_atheros "$device" + + [ auto = "$channel" ] && channel=0 + local first=1 for vif in $vifs; do nosbeacon= @@ -93,7 +96,9 @@ enable_atheros() { [ "$first" = 1 ] && { # only need to change freq band and channel on the first vif - config_get agmode "$device" mode + config_get agmode "$device" agmode + [ -z "$agmode" ] && config_get agmode "$device" mode + pureg=0 case "$agmode" in *b) agmode=11b;; @@ -102,9 +107,6 @@ enable_atheros() { *a) agmode=11a;; *) agmode=auto;; esac - iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null - ifconfig "$ifname" up - sleep 1 iwpriv "$ifname" mode "$agmode" iwpriv "$ifname" pureg "$pureg" iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null @@ -113,8 +115,13 @@ enable_atheros() { config_get_bool hidden "$vif" hidden 0 iwpriv "$ifname" hide_ssid "$hidden" - config_get_bool ff "$vif" ff 0 - iwpriv "$ifname" ff "$ff" + config_get ff "$vif" ff + if [ -n "$ff" ]; then + iwpriv "$ifname" ff "$ff" + fi + + config_get wdssep "$vif" wdssep + [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep" config_get wds "$vif" wds case "$wds" in @@ -156,47 +163,87 @@ enable_atheros() { esac config_get ssid "$vif" ssid - [ "$mode" = "sta" ] && { - config_get_bool bgscan "$vif" bgscan 1 - iwpriv "$ifname" bgscan "$bgscan" - } + config_get_bool bgscan "$vif" bgscan + [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan" - config_get_bool antdiv "$device" diversity 1 - sysctl -w dev."$device".diversity="$antdiv" >&- + config_get_bool antdiv "$device" diversity + [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&- config_get antrx "$device" rxantenna - if [ -n "$antrx" ]; then - sysctl -w dev."$device".rxantenna="$antrx" >&- - fi + [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&- config_get anttx "$device" txantenna - if [ -n "$anttx" ]; then - sysctl -w dev."$device".txantenna="$anttx" >&- - fi + [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&- config_get distance "$device" distance - if [ -n "$distance" ]; then - athctrl -i "$device" -d "$distance" >&- - fi + [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&- config_get txpwr "$vif" txpower - if [ -n "$txpwr" ]; then - iwconfig "$ifname" txpower "${txpwr%%.*}" - fi + [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}" + + config_get rate "$vif" rate + [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}" + + config_get mcast_rate "$vif" mcast_rate + [ -n "$mcast_rate" ] && iwpriv "$ifname" mcast_rate "${mcast_rate%%.*}" config_get frag "$vif" frag - if [ -n "$frag" ]; then - iwconfig "$ifname" frag "${frag%%.*}" - fi + [ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}" config_get rts "$vif" rts - if [ -n "$rts" ]; then - iwconfig "$ifname" rts "${rts%%.*}" - fi + [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}" - ifconfig "$ifname" up - iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null + config_get_bool comp "$vif" compression + [ -n "$comp" ] && iwpriv "$ifname" compression "$comp" + config_get_bool minrate "$vif" minrate + [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate" + + config_get_bool maxrate "$vif" maxrate + [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate" + + config_get_bool burst "$vif" bursting + [ -n "$burst" ] && iwpriv "$ifname" burst "$burst" + + config_get_bool wmm "$vif" wmm + [ -n "$wmm" ] && iwpriv "$ifname" wmm "$wmm" + + config_get_bool xr "$vif" xr + [ -n "$xr" ] && iwpriv "$ifname" xr "$xr" + + config_get_bool ar "$vif" ar + [ -n "$ar" ] && iwpriv "$ifname" ar "$ar" + + config_get_bool turbo "$vif" turbo + [ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo" + + config_get_bool doth "$vif" doth 0 + [ -n "$doth" ] && iwpriv "$ifname" doth "$doth" + + config_get maclist "$vif" maclist + [ -n "$maclist" ] && { + # flush MAC list + iwpriv "$ifname" maccmd 3 + for mac in $maclist; do + iwpriv "$ifname" addmac "$mac" + done + } + + config_get macpolicy "$vif" macpolicy + case "$macpolicy" in + allow) + iwpriv "$ifname" maccmd 1 + ;; + deny) + iwpriv "$ifname" maccmd 2 + ;; + *) + # default deny policy if mac list exists + [ -n "$maclist" ] && iwpriv "$ifname" maccmd 2 + ;; + esac + + ifconfig "$ifname" up local net_cfg bridge net_cfg="$(find_net_config "$vif")" [ -z "$net_cfg" ] || { @@ -205,6 +252,7 @@ enable_atheros() { start_net "$ifname" "$net_cfg" } iwconfig "$ifname" essid "$ssid" + set_wifi_up "$vif" "$ifname" case "$mode" in ap) config_get_bool isolate "$vif" isolate 0 @@ -221,22 +269,34 @@ enable_atheros() { fi ;; wds|sta) - case "$enc" in + config_get_bool usepassphrase "$vif" passphrase 1 + case "$enc" in PSK|psk|PSK2|psk2) case "$enc" in PSK|psk) - proto='proto=WPA';; + proto='proto=WPA' + if [ "$usepassphrase" = "1" ]; then + passphrase="psk=\"${key}\"" + else + passphrase="psk=${key}" + fi + ;; PSK2|psk2) - proto='proto=RSN';; + proto='proto=RSN' + if [ "$usepassphrase" = "1" ]; then + passphrase="psk=\"${key}\"" + else + passphrase="psk=${key}" + fi + ;; esac cat > /var/run/wpa_supplicant-$ifname.conf <