base-files: fix whitespaces

[openwrt/staging/chunkeey.git] / package / base-files / files / sbin / wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index e2dd0a32d560fddc552eee6be66786aa9ed099ac..897ee4ff14083a4a6b90a84a07dabae064cc3c88 100755 (executable)
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -1,16 +1,26 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-. /etc/functions.sh
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
 
 usage() {
        cat <<EOF
-Usage: $0 [down|detect]
+Usage: $0 [down|detect|reload|status]
 enables (default), disables or detects a wifi configuration.
 EOF
        exit 1
 }
 
+ubus_wifi_cmd() {
+       local cmd="$1"
+       local dev="$2"
+
+       json_init
+       [ -n "$2" ] && json_add_string device "$2"
+       ubus call network.wireless "$1" "$(json_dump)"
+}
+
 find_net_config() {(
        local vif="$1"
        local cfg
@@ -38,8 +48,12 @@ bridge_interface() {(
        include /lib/network
        scan_interfaces
 
-       config_get iftype "$cfg" type
-       [ "$iftype" = bridge ] && config_get "$cfg" ifname
+       for cfg in $cfg; do
+               config_get iftype "$cfg" type
+               [ "$iftype" = bridge ] && config_get "$cfg" ifname
+               prepare_interface_bridge "$cfg"
+               return $?
+       done
 )}
 
 prepare_key_wep() {
@@ -50,7 +64,7 @@ prepare_key_wep() {
        [ "${#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" ""')"
+               key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')"
        }
        echo "$key"
 }
@@ -77,7 +91,7 @@ wifi_fixup_hwmode() {
                ;;
                *)
                        hwmode=
-                       if [ "${channel:-0}" -gt 0 ]; then 
+                       if [ "${channel:-0}" -gt 0 ]; then
                                if [ "${channel:-0}" -gt 14 ]; then
                                        hwmode=a
                                else
@@ -91,11 +105,7 @@ wifi_fixup_hwmode() {
        config_set "$device" hwmode "$hwmode"
 }
 
-wifi_updown() {
-       [ enable = "$1" ] && {
-               wifi_updown disable "$2"
-               scan_wifi
-       }
+_wifi_updown() {
        for device in ${2:-$DEVICES}; do (
                config_get disabled "$device" disabled
                [ 1 == "$disabled" ] && {
@@ -106,12 +116,35 @@ wifi_updown() {
                if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
                        eval "scan_$iftype '$device'"
                        eval "${1}_$iftype '$device'" || echo "$device($iftype): ${1} failed"
-               else
+               elif [ ! -f /lib/netifd/wireless/$iftype.sh ]; then
                        echo "$device($iftype): Interface type not supported"
                fi
        ); done
 }
 
+wifi_updown() {
+       cmd=down
+       [ enable = "$1" ] && {
+               _wifi_updown disable "$2"
+               ubus_wifi_cmd "$cmd" "$2"
+               scan_wifi
+               cmd=up
+       }
+       ubus_wifi_cmd "$cmd" "$2"
+       _wifi_updown "$@"
+}
+
+wifi_reload_legacy() {
+       _wifi_updown "disable" "$1"
+       scan_wifi
+       _wifi_updown "enable" "$1"
+}
+
+wifi_reload() {
+       ubus call network reload
+       wifi_reload_legacy
+}
+
 wifi_detect() {
        for driver in ${2:-$DRIVERS}; do (
                if eval "type detect_$driver" 2>/dev/null >/dev/null; then
@@ -128,9 +161,13 @@ start_net() {(
        local vifmac="$3"
 
        [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
-       include /lib/network
-       scan_interfaces
-       setup_interface "$iface" "$config" "" "$vifmac"
+       [ -z "$config" ] || {
+               include /lib/network
+               scan_interfaces
+               for config in $config; do
+                       setup_interface "$iface" "$config" "" "$vifmac"
+               done
+       }
 )}
 
 set_wifi_up() {
@@ -174,7 +211,7 @@ scan_wifi() {
                case "$TYPE" in
                        wifi-iface)
                                config_get device "$CONFIG_SECTION" device
-                               config_get vifs "$device" vifs 
+                               config_get vifs "$device" vifs
                                append vifs "$CONFIG_SECTION"
                                config_set "$device" vifs "$vifs"
                        ;;
@@ -191,6 +228,9 @@ scan_wifi
 case "$1" in
        down) wifi_updown "disable" "$2";;
        detect) wifi_detect "$2";;
+       status) ubus_wifi_cmd "status" "$2";;
+       reload) wifi_reload "$2";;
+       reload_legacy) wifi_reload_legacy "$2";;
        --help|help) usage;;
        *) wifi_updown "enable" "$2";;
 esac