X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2fa68be58d30e6c73e6cfc3ccb5bb97396e5fba1..39b5ef6e05b90c4249c13d553ff75c17ef256eb1:/package/madwifi/files/lib/wifi/madwifi.sh?ds=sidebyside diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 569c96e71..46f994ea7 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -1,5 +1,4 @@ #!/bin/sh -set -x append DRIVERS "atheros" scan_atheros() { @@ -15,34 +14,48 @@ scan_atheros() { config_get mode "$vif" mode case "$mode" in - adhoc|sta|ap) + adhoc|ahdemo|sta|ap) append $mode "$vif" ;; wds) config_get addr "$vif" bssid - ${addr:+append wds "$addr"} + config_get ssid "$vif" ssid + [ -z "$addr" -a -n "$ssid" ] && { + config_set "$vif" wds 1 + config_set "$vif" mode sta + mode="sta" + addr="$ssid" + } + ${addr:+append $mode "$vif"} ;; *) echo "$device($vif): Invalid mode, ignored."; continue;; esac done - case "${adhoc:+1}:${sta:+}:${ap+1}" in + case "${adhoc:+1}:${sta:+1}:${ap+1}" in # valid mode combinations - 1::);; + 1::) wds="";; + 1::1);; :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA :1:);; ::1);; - :::);; + ::);; *) echo "$device: Invalid mode combination in config"; return 1;; esac - config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }" - - [ -z "$adhoc" ] && config_set "$device" wds "$wdsifs" + config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }" } + disable_atheros() ( local device="$1" + + # kill all running hostapd and wpa_supplicant processes that + # are running on atheros vifs + for pid in `pidof hostapd wpa_supplicant`; do + grep ath /proc/$pid/cmdline >/dev/null && \ + kill $pid + done include /lib/network cd /proc/sys/net @@ -50,16 +63,18 @@ disable_atheros() ( grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && { ifconfig "$dev" down unbridge "$dev" - wlanconfig $dev destroy + wlanconfig "$dev" destroy } done + return 0 ) enable_atheros() { config_get channel "$device" channel - config_get wds "$device" wds config_get vifs "$device" vifs - + + disable_atheros "$device" + local first=1 for vif in $vifs; do nosbeacon= config_get ifname "$vif" ifname @@ -70,12 +85,44 @@ enable_atheros() { config_get ifname "$vif" ifname ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon}) - config_set "$vif" ifname "$ifname" - [ $? -ne 0 ] && { - echo "enable_atheros($device): Failed to set up vif $ifname" >&2 + echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2 continue } + config_set "$vif" ifname "$ifname" + + [ "$first" = 1 ] && { + # only need to change freq band and channel on the first vif + config_get agmode "$device" mode + pureg=0 + case "$agmode" in + *b) agmode=11b;; + *bg) agmode=11g;; + *g) agmode=11g; pureg=1;; + *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 + } + + 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;; + *) wds=0;; + esac + iwpriv "$ifname" wds "$wds" + wpa= case "$enc" in WEP|wep) @@ -84,49 +131,131 @@ enable_atheros() { iwconfig "$ifname" enc "[$idx]" "${key:-off}" done config_get key "$vif" key - iwconfig "$ifname" enc "$key" + 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 ;; esac + case "$mode" in - ap) - local hostapd_cfg= - case "$enc" in - *psk*|*PSK*) - # FIXME: wpa - ;; - *wpa*|*WPA*) - # FIXME: add wpa+radius here - ;; - esac + wds) + config_get addr "$vif" bssid + iwpriv "$ifname" wds_add "$addr" ;; - sta) - # FIXME: implement wpa_supplicant calls here + adhoc|ahdemo) + config_get addr "$vif" bssid + [ -z "$addr" ] || { + iwconfig "$ifname" ap "$addr" + } ;; - esac - + esac config_get ssid "$vif" ssid - append if_up "iwconfig $ifname essid $ssid channel $channel" ";$N" - append if_up "sleep 1" ";$N" - append if_up "ifconfig $ifname up" ";$N" - + + [ "$mode" = "sta" ] && { + config_get_bool bgscan "$vif" bgscan 1 + iwpriv "$ifname" bgscan "$bgscan" + } + + config_get_bool antdiv "$device" diversity 1 + sysctl -w dev."$device".diversity="$antdiv" >&- + + config_get antrx "$device" rxantenna + if [ -n "$antrx" ]; then + sysctl -w dev."$device".rxantenna="$antrx" >&- + fi + + config_get anttx "$device" txantenna + if [ -n "$anttx" ]; then + sysctl -w dev."$device".txantenna="$anttx" >&- + fi + + config_get distance "$device" distance + if [ -n "$distance" ]; then + athctrl -i "$device" -d "$distance" >&- + fi + + 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")" - append if_up "start_net '$ifname' '$net_cfg'" ";$N" + config_set "$vif" bridge "$bridge" + start_net "$ifname" "$net_cfg" } - # TODO: start hostapd + iwconfig "$ifname" essid "$ssid" + case "$mode" in + ap) + 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';; + PSK2|psk2) + proto='proto=RSN';; + esac + cat > /var/run/wpa_supplicant-$ifname.conf <&- 2>&- - eval "$if_up" } 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 <