X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6803b047916838c065b77dff2e1ff4037f43056d..3646d3c2260f274120fdde404070a3a3d4e45020:/package/madwifi/files/lib/wifi/madwifi.sh diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 15e7850eb..41a25a400 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,7 +94,7 @@ 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;; @@ -101,16 +103,20 @@ enable_atheros() { *a) agmode=11a;; *) agmode=auto;; esac - iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null + 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" >/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_bool ff "$vif" ff 0 + iwpriv "$ifname" ff "$ff" + config_get wds "$vif" wds case "$wds" in 1|on|enabled) wds=1;; @@ -142,21 +148,17 @@ 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 0 + iwpriv "$ifname" bgscan "$bgscan" config_get_bool antdiv "$device" diversity 1 sysctl -w dev."$device".diversity="$antdiv" >&- @@ -181,6 +183,16 @@ enable_atheros() { iwconfig "$ifname" txpower "${txpwr%%.*}" fi + config_get frag "$vif" frag + if [ -n "$frag" ]; then + iwconfig "$ifname" frag "${frag%%.*}" + fi + + config_get rts "$vif" rts + if [ -n "$rts" ]; then + iwconfig "$ifname" rts "${rts%%.*}" + fi + ifconfig "$ifname" up iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null @@ -192,25 +204,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 <