X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2Ffiles%2Flib%2Fwifi%2Fmadwifi.sh;h=1320e5643f36dd9c4ac74f880ab2808a3a879a69;hb=6cd6d5e9b11885c94d94751ec4c5b35ba87a03ab;hp=e7e227bb7077489a59f26eb03fa84a1c65810ee5;hpb=2c83d00ba13bcc59bc15e13d0e1856976f63cff6;p=openwrt.git diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index e7e227bb70..1320e5643f 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 @@ -72,7 +74,6 @@ enable_atheros() { config_get channel "$device" channel config_get vifs "$device" vifs - disable_atheros "$device" local first=1 for vif in $vifs; do nosbeacon= @@ -99,17 +100,22 @@ enable_atheros() { *bg) agmode=11g;; *g) agmode=11g; pureg=1;; *a) agmode=11a;; - *) agmode=11g;; + *) agmode=auto;; esac - iwconfig "$ifname" channel 0 + 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" + 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;; @@ -125,7 +131,11 @@ enable_atheros() { iwconfig "$ifname" enc "[$idx]" "${key:-off}" done config_get key "$vif" key - iwconfig "$ifname" enc "${key:-1}" + key="${key:-1}" + case "$key" in + [1234]) iwconfig "$ifname" enc "[$key]";; + *) iwconfig "$ifname" enc "$key";; + esac ;; PSK|psk|PSK2|psk2) config_get key "$vif" key @@ -137,10 +147,14 @@ enable_atheros() { config_get addr "$vif" bssid iwpriv "$ifname" wds_add "$addr" ;; - *) - config_get ssid "$vif" ssid + 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 @@ -170,7 +184,18 @@ 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 local net_cfg bridge net_cfg="$(find_net_config "$vif")" @@ -180,15 +205,21 @@ 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 @@ -214,11 +245,7 @@ EOF #add wpa_supplicant calls here ;; esac - net_cfg="$(find_net_config "$vif")" - [ -z "$net_cfg" ] || { - bridge="$(bridge_interface "$net_cfg")" - } - wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf + [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf ;; esac first=0 @@ -229,28 +256,23 @@ EOF detect_atheros() { cd /proc/sys/dev [ -d ath ] || return - for dev in wifi*; do + for dev in $(ls -d wifi* 2>&-); do config_get type "$dev" type [ "$type" = atheros ] && return cat <