X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmadwifi%2Ffiles%2Flib%2Fwifi%2Fmadwifi.sh;h=ca933a1ddd1f3f6c14b0a4060d944592e04ae95a;hp=89ab83d8fd115c2ea0d8513fef2ed0bd2c8d824b;hb=9adf83b2fd934bedbdc2ba0e6d679ae1d25889c9;hpb=3bcfac7e0ece8d152f56f7973bfb3aa37c265507 diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 89ab83d8fd..ca933a1ddd 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|sta|ap) + adhoc|ahdemo|sta|ap) append $mode "$vif" ;; wds) @@ -35,6 +35,7 @@ scan_atheros() { case "${adhoc:+1}:${sta:+1}:${ap+1}" in # valid mode combinations 1::) wds="";; + 1::1);; :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA :1:);; ::1);; @@ -42,13 +43,14 @@ scan_atheros() { *) echo "$device: Invalid mode combination in config"; return 1;; esac - config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }" + config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }" } 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 @@ -69,10 +71,10 @@ disable_atheros() ( ) enable_atheros() { + local device="$1" config_get channel "$device" channel config_get vifs "$device" vifs - disable_atheros "$device" local first=1 for vif in $vifs; do nosbeacon= @@ -92,24 +94,31 @@ 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 pureg=0 case "$agmode" in *b) agmode=11b;; *bg) agmode=11g;; *g) agmode=11g; pureg=1;; *a) agmode=11a;; - *) agmode=11g;; + *) agmode=auto;; esac - iwconfig "$ifname" channel 0 + iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null + ifconfig "$ifname" up + sleep 1 iwpriv "$ifname" mode "$agmode" iwpriv "$ifname" pureg "$pureg" - iwconfig "$ifname" channel "$channel" + iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null } - config_get_bool hidden "$vif" hidden + config_get_bool hidden "$vif" hidden 0 iwpriv "$ifname" hide_ssid "$hidden" + config_get ff "$vif" ff + if [ -n "$ff" ]; then + iwpriv "$ifname" ff "$ff" + fi + config_get wds "$vif" wds case "$wds" in 1|on|enabled) wds=1;; @@ -141,46 +150,91 @@ enable_atheros() { config_get addr "$vif" bssid iwpriv "$ifname" wds_add "$addr" ;; - *) - config_get ssid "$vif" ssid - ;; - adhoc) + adhoc|ahdemo) config_get addr "$vif" bssid [ -z "$addr" ] || { iwconfig "$ifname" ap "$addr" } ;; 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 + [ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}" + + config_get rts "$vif" rts + [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}" + + config_get_bool doth "$vif" 80211h + [ -n "$doth" ] && iwpriv "$ifname" doth "$doth" + + config_get_bool comp "$vif" compression + [ -n "$comp" ] && iwpriv "$ifname" compression "$comp" + + 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 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 + iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null local net_cfg bridge net_cfg="$(find_net_config "$vif")" @@ -190,25 +244,36 @@ enable_atheros() { start_net "$ifname" "$net_cfg" } iwconfig "$ifname" essid "$ssid" + set_wifi_up "$vif" "$ifname" case "$mode" in ap) - hostapd_setup_vif "$vif" madwifi || { - echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - wlanconfig "$ifname" destroy - continue - } + config_get_bool isolate "$vif" isolate 0 + iwpriv "$ifname" ap_bridge "$((isolate^1))" + + if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then + hostapd_setup_vif "$vif" madwifi || { + echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2 + # make sure this wifi interface won't accidentally stay open without encryption + ifconfig "$ifname" down + wlanconfig "$ifname" destroy + continue + } + fi ;; wds|sta) case "$enc" in PSK|psk|PSK2|psk2) case "$enc" in PSK|psk) - proto='proto=WPA';; + proto='proto=WPA' + passphrase="${key}" + ;; PSK2|psk2) - proto='proto=RSN';; + proto='proto=RSN' + passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2` + ;; esac + cat > /var/run/wpa_supplicant-$ifname.conf <