X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/af5a1e3a29c9a33f3d1083e8d1421785569cc763..7ebf9e77c6c6439c3eee7a3721101b8126b66863:/package/base-files/files/sbin/wifi?ds=sidebyside diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi index 151036e9c..e21ea6ba9 100755 --- a/package/base-files/files/sbin/wifi +++ b/package/base-files/files/sbin/wifi @@ -34,14 +34,66 @@ bridge_interface() {( [ "$iftype" = bridge ] && config_get "$cfg" ifname )} +prepare_key_wep() { + local key="$1" + local hex=1 + + echo -n "$key" | grep -qE "[^a-fA-F0-9]" && hex=0 + [ "${#key}" -eq 10 -a $hex -eq 1 ] || \ + [ "${#key}" -eq 26 -a $hex -eq 1 ] || { + [ "${key:0:2}" = "s:" ] && key="${key#s:}" + key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')" + } + echo "$key" +} + +wifi_fixup_hwmode() { + local device="$1" + local default="$2" + local hwmode hwmode_11n + + config_get channel "$device" channel + config_get hwmode "$device" hwmode + case "$hwmode" in + 11bg) hwmode=bg;; + 11a) hwmode=a;; + 11b) hwmode=b;; + 11g) hwmode=g;; + 11n*) + hwmode_11n="${hwmode##11n}" + case "$hwmode_11n" in + a|g) ;; + default) hwmode_11n="$default" + esac + config_set "$device" hwmode_11n "$hwmode_11n" + ;; + *) + hwmode= + if [ "${channel:-0}" -gt 0 ]; then + if [ "${channel:-0}" -gt 14 ]; then + hwmode=a + else + hwmode=g + fi + else + hwmode="$default" + fi + ;; + esac + config_set "$device" hwmode "$hwmode" +} wifi_updown() { + [ enable = "$1" ] && { + wifi_updown disable "$2" + scan_wifi + } for device in ${2:-$DEVICES}; do ( - config_get disabled "$device" disabled - [ "$disabled" == "1" ] && { - echo "'$device' is disabled" - set disable - } + config_get disabled "$device" disabled + [ 1 == "$disabled" ] && { + echo "'$device' is disabled" + set disable + } config_get iftype "$device" type if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then eval "scan_$iftype '$device'" @@ -65,31 +117,59 @@ wifi_detect() { start_net() {( local iface="$1" local config="$2" + local vifmac="$3" + [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null include /lib/network scan_interfaces - setup_interface "$1" "$2" + setup_interface "$iface" "$config" "" "$vifmac" )} -config_cb() { - config_get TYPE "$CONFIG_SECTION" TYPE - case "$TYPE" in - wifi-device) - append DEVICES "$CONFIG_SECTION" - ;; - wifi-iface) - config_get device "$CONFIG_SECTION" device - config_get vifs "$device" vifs - append vifs "$CONFIG_SECTION" - config_set "$device" vifs "$vifs" - ;; - esac +set_wifi_up() { + local cfg="$1" + local ifname="$2" + uci_set_state wireless "$cfg" up 1 + uci_set_state wireless "$cfg" ifname "$ifname" +} + +set_wifi_down() { + local cfg="$1" + local vifs vif vifstr + + [ -f "/var/run/wifi-${cfg}.pid" ] && + kill "$(cat "/var/run/wifi-${cfg}.pid")" 2>/dev/null + uci_revert_state wireless "$cfg" + config_get vifs "$cfg" vifs + for vif in $vifs; do + uci_revert_state wireless "$vif" + done +} + +scan_wifi() { + local cfgfile="$1" + DEVICES= + config_cb() { + config_get TYPE "$CONFIG_SECTION" TYPE + case "$TYPE" in + wifi-device) + append DEVICES "$CONFIG_SECTION" + config_set "$CONFIG_SECTION" vifs "" + ;; + wifi-iface) + config_get device "$CONFIG_SECTION" device + config_get vifs "$device" vifs + append vifs "$CONFIG_SECTION" + config_set "$device" vifs "$vifs" + ;; + esac + } + config_load "${cfgfile:-wireless}" } DEVICES= DRIVERS= -config_load wireless include /lib/wifi +scan_wifi case "$1" in down) wifi_updown "disable" "$2";;