X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/29ea2061413bbd85baa419cc16c9465f0ab55967..43e043890d5b61b05c819b3ad866edf5f874352d:/package/base-files/files/sbin/wifi

diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 51e10af10..5cbf50b5f 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -3,6 +3,14 @@
 
 . /etc/functions.sh
 
+usage() {
+	cat <<EOF
+Usage: $0 [down|detect]
+enables (default), disables or detects a wifi configuration.
+EOF
+	exit 1
+}
+
 find_net_config() {(
 	local vif="$1"
 	local cfg
@@ -32,17 +40,69 @@ bridge_interface() {(
 
 	config_get iftype "$cfg" type
 	[ "$iftype" = bridge ] && config_get "$cfg" ifname
+	prepare_interface_bridge "$cfg"
 )}
 
+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"
+	[ enable = "$1" ] && {
+		wifi_updown disable "$2"
+		scan_wifi
+	}
 	for device in ${2:-$DEVICES}; do (
-	        config_get disabled "$device" disabled
-	        [ 1 == "$disabled" ] && {
-	        	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'"
@@ -66,41 +126,55 @@ wifi_detect() {
 start_net() {(
 	local iface="$1"
 	local config="$2"
+	local vifmac="$3"
 
-	include /lib/network
-	scan_interfaces
-	setup_interface "$1" "$2"
+	[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
+	[ -z "$config" ] || {
+		include /lib/network
+		scan_interfaces
+		setup_interface "$iface" "$config" "" "$vifmac"
+	}
 )}
 
 set_wifi_up() {
 	local cfg="$1"
 	local ifname="$2"
-	uci set "/var/state/wireless.${cfg}.up=1"
-	uci set "/var/state/wireless.${cfg}.ifname=$ifname"
+	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/state/wireless ] || return
 
+	[ -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
-		append vifstr "$vif" "|"
+		uci_revert_state wireless "$vif"
 	done
-	FILE="/var/state/wireless.$$"
-	grep -vE "^config_set '($vifstr)' " /var/state/wireless > "$FILE"
-	mv "$FILE" /var/state/wireless
 }
 
 scan_wifi() {
 	local cfgfile="$1"
+	DEVICES=
 	config_cb() {
-		config_get TYPE "$CONFIG_SECTION" TYPE
-		case "$TYPE" in
+		local type="$1"
+		local section="$2"
+
+		# section start
+		case "$type" in
 			wifi-device)
-				append DEVICES "$CONFIG_SECTION"
+				append DEVICES "$section"
+				config_set "$section" vifs ""
+				config_set "$section" ht_capab ""
 			;;
+		esac
+
+		# section end
+		config_get TYPE "$CONFIG_SECTION" TYPE
+		case "$TYPE" in
 			wifi-iface)
 				config_get device "$CONFIG_SECTION" device
 				config_get vifs "$device" vifs 
@@ -120,5 +194,6 @@ scan_wifi
 case "$1" in
 	down) wifi_updown "disable" "$2";;
 	detect) wifi_detect "$2";;
+	--help|help) usage;;
 	*) wifi_updown "enable" "$2";;
 esac