From bc196e68fef6ede22ee3f5a00ca7af496e840192 Mon Sep 17 00:00:00 2001 From: Vasilis Tsiligiannis Date: Thu, 17 Mar 2011 07:23:28 +0000 Subject: [PATCH] acx: Major rework of acx.sh script SVN-Revision: 26201 --- package/acx/files/lib/wifi/acx.sh | 291 ++++++++++++++---------------- 1 file changed, 140 insertions(+), 151 deletions(-) diff --git a/package/acx/files/lib/wifi/acx.sh b/package/acx/files/lib/wifi/acx.sh index 9305b85cb6..7ebc3c79cb 100644 --- a/package/acx/files/lib/wifi/acx.sh +++ b/package/acx/files/lib/wifi/acx.sh @@ -1,202 +1,191 @@ #!/bin/sh append DRIVERS "acx" +find_acx_phy() { + local device="$1" + + local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')" + config_get phy "$device" phy + [ -z "$phy" -a -n "$macaddr" ] && { + cd /proc/driver + for phy in $(ls acx_wlan[0-9] 2>&-); do + phy=${phy#acx_} + [ "$macaddr" = "$(cat /sys/class/net/${phy}/address)" ] || continue + config_set "$device" phy "$phy" + break + done + config_get phy "$device" phy + } + [ -n "$phy" -a -f "/proc/driver/acx_$phy" ] || { + echo "phy for wifi device $1 not found" + return 1 + } + [ -z "$macaddr" ] && { + config_set "$device" macaddr "$(cat /sys/class/net/${phy}/address)" + } + return 0 +} + scan_acx() { local device="$1" - local adhoc sta ap - + + [ ${device%[0-9]} = "wlan" ] && config_set "$device" phy "$device" || find_acx_phy "$device" || { + config_unset "$device" vifs + return 0 + } + config_get phy "$device" phy + config_get vifs "$device" vifs for vif in $vifs; do - - config_get ifname "$vif" ifname - config_set "$vif" ifname "${ifname:-$device}" - config_get mode "$vif" mode case "$mode" in adhoc|sta|ap|monitor) - append $mode "$vif" + # Only one vif is allowed + config_set "$vif" ifname "$phy" + break ;; *) echo "$device($vif): Invalid mode, ignored."; continue;; esac done - - config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}" + config_set "$device" vifs "$vif" } - disable_acx() ( local device="$1" + find_acx_phy "$device" || return 0 + config_get phy "$device" phy + set_wifi_down "$device" - # kill all running hostapd and wpa_supplicant processes that - # are running on atheros/mac80211 vifs - for pid in `pidof hostapd wpa_supplicant`; do - grep wlan /proc/$pid/cmdline >/dev/null && \ - kill $pid - done - + include /lib/network - cd /proc/sys/net - for dev in *; do - grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && { - ifconfig "$dev" down - unbridge "$dev" - } - done + unbridge "$phy" return 0 ) enable_acx() { local device="$1" + + find_acx_phy "$device" || return 0 + config_get phy "$device" phy + + config_get regdomain "$device" regdomain + [ -n "$regdomain" ] && iwpriv "$device" SetRegDomain "$regdomain" + + config_get rxantenna "$device" rxantenna + config_get txantenna "$device" txantenna + config_get_bool diversity "$device" diversity + [ -n "$diversity" ] && { + rxantenna="2" + } + [ -n "$rxantenna" ] && iwpriv "$phy" SetRxAnt "$rxantenna" + [ -n "$txantenna" ] && iwpriv "$phy" SetTxAnt "$txantenna" + config_get channel "$device" channel - config_get vifs "$device" vifs - config_get country "$device" country - - local first=1 - for vif in $vifs; do - config_get ifname "$vif" ifname - ifconfig "$ifname" down - config_get enc "$vif" encryption - config_get eap_type "$vif" eap_type - config_get mode "$vif" mode - - config_get ifname "$vif" ifname - [ $? -ne 0 ] && { - echo "enable_acx($device): Failed to set up $mode vif $ifname" >&2 - continue - } - config_set "$vif" ifname "$ifname" + [ -n "$channel" ] && iwconfig "$phy" channel "$channel" >/dev/null 2>/dev/null - [ "$first" = 1 ] && { - # only need to change freq band and channel on the first vif - case $country in - us) - iwpriv "$device" SetRegDomain 1 - ;; - ca) - iwpriv "$device" SetRegDomain 2 - ;; - de|uk|be|hu|nl|pt|pl|se|dk) - iwpriv "$device" SetRegDomain 3 - ;; - es) - iwpriv "$device" SetRegDomain 4 - ;; - fr) - iwpriv "$device" SetRegDomain 5 - ;; - jp) - iwpriv "$device" SetRegDomain 7 - ;; - il) - iwpriv "$device" SetRegDomain 8 + config_get txpower "$device" txpower + [ -n "$txpower" ] && iwconfig "$phy" txpower "${txpower%%.*}" + + config_get vif "$device" vifs + + config_get ifname "$vif" ifname + config_get ssid "$vif" ssid + config_get mode "$vif" mode + + iwconfig "$phy" essid ${ssid:+-- }"${ssid:-any}" + + case "$mode" in + sta) + iwconfig "$phy" mode managed + config_get addr "$device" bssid + [ -z "$addr" ] || { + iwconfig "$phy" ap "$addr" + } + ;; + ap) iwconfig "$phy" mode master;; + adhoc) iwconfig "$phy" mode ad-hoc;; + *) iwconfig "$phy" mode "$mode";; + esac + + config_get frag "$vif" frag + [ -n "$frag" ] && iwconfig "$phy" frag "${frag%%.*}" + + config_get rts "$vif" rts + [ -n "$rts" ] && iwconfig "$phy" rts "${rts%%.*}" + + config_get enc "$vif" encryption + case "$enc" in + wep) + for idx in 1 2 3 4; do + config_get key "$vif" "key${idx}" + iwconfig "$ifname" enc restricted "[$idx]" "${key:-off}" + done + config_get key "$vif" key + key="${key:-1}" + case "$key" in + [1234]) iwconfig "$ifname" enc restricted "[$key]";; + *) iwconfig "$ifname" enc restricted "$key";; esac - - iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null - if [ "$mode" = adhoc ]; then - iwlist "$ifname" scan >/dev/null 2>/dev/null - sleep 1 - iwconfig "$ifname" mode ad-hoc >/dev/null 2>/dev/null - fi - sleep 1 - iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null - } + ;; + psk*|wpa*) + echo "$device($vif): WPA/WPA2 not supported by acx driver" + return 1 + ;; + esac - case "$mode" in - sta) - iwconfig "$ifname" mode managed >/dev/null 2>/dev/null - ;; - ap) - iwconfig "$ifname" mode master >/dev/null 2>/dev/null - ;; - *) - iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null - esac - - wpa= - case "$enc" in - WEP|wep) - for idx in 1 2 3 4; do - config_get key "$vif" "key${idx}" - iwconfig "$ifname" enc "[$idx]" "${key:-off}" - done - config_get key "$vif" key - key="${key:-1}" - case "$key" in - [1234]) iwconfig "$ifname" enc restricted "[$key]";; - *) iwconfig "$ifname" enc restricted "$key";; - esac - ;; - PSK|psk|PSK2|psk2) - echo "WARNING WPA / WPA2 not supported by acx driver" - config_get key "$vif" key - ;; - esac + local net_cfg bridge + net_cfg="$(find_net_config "$vif")" + [ -z "$net_cfg" ] || { + bridge="$(bridge_interface "$net_cfg")" + config_set "$vif" bridge "$bridge" + start_net "$ifname" "$net_cfg" + } + set_wifi_up "$vif" "$ifname" - case "$mode" in - adhoc) - config_get addr "$vif" bssid - [ -z "$addr" ] || { - iwconfig "$ifname" ap "$addr" - } - ;; - esac - config_get ssid "$vif" ssid - - config_get txpwr "$vif" txpower - if [ -n "$txpwr" ]; then - 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")" - [ -z "$net_cfg" ] || { - bridge="$(bridge_interface "$net_cfg")" - config_set "$vif" bridge "$bridge" - start_net "$ifname" "$net_cfg" - } - iwconfig "$ifname" essid "$ssid" - set_wifi_up "$vif" "$ifname" - first=0 - done - - echo 1 >/sys/class/leds/wifi/brightness || : } +check_acx_device() { + [ ${1%[0-9]} = "wlan" ] && config_set "$1" phy "$1" + config_get phy "$1" phy + [ -z "$phy" ] && { + find_acx_phy "$1" >/dev/null || return 0 + config_get phy "$1" phy + } + [ "$phy" = "$dev" ] && found=1 +} detect_acx() { - cd /sys/class/net - for dev in $(ls -d wlan* 2>&-); do - config_get type "$dev" type - [ "$type" = acx ] && continue + devidx=0 + config_load wireless + while :; do + config_get type "radio$devidx" type + [ -n "$type" ] || break + devidx=$(($devidx + 1)) + done + cd /proc/driver + for dev in $(ls acx_wlan[0-9] 2>&-); do + dev=${dev#acx_} + found=0 + config_foreach check_acx_device wifi-device + [ "$found" -gt 0 ] && continue cat <