X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/65cccc8b67e762d9fd00d6e73049ebbeae9f9482..0cee365af00ce629322ec7498a2c5b0a7e7fba4e:/package/madwifi/files/lib/wifi/madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index a8fb101a6..5d4adc58f 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -14,7 +14,7 @@ scan_atheros() {
 		
 		config_get mode "$vif" mode
 		case "$mode" in
-			adhoc|sta|ap)
+			adhoc|ahdemo|sta|ap)
 				append $mode "$vif"
 			;;
 			wds)
@@ -35,6 +35,7 @@ scan_atheros() {
 	case "${adhoc:+1}:${sta:+1}:${ap+1}" in
 		# valid mode combinations
 		1::) wds="";;
+		1::1);;
 		:1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
 		:1:);;
 		::1);;
@@ -42,7 +43,7 @@ scan_atheros() {
 		*) echo "$device: Invalid mode combination in config"; return 1;;
 	esac
 
-	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
+	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
 }
 
 
@@ -92,20 +93,24 @@ enable_atheros() {
 
 		[ "$first" = 1 ] && {
 			# only need to change freq band and channel on the first vif
-			config_get "$device" mode
+			config_get agmode "$device" mode
 			pureg=0
-			case "$mode" in
-				*b) mode=11b;;
-				*bg) mode=11g;;
-				*g) mode=11g; pureg=1;;
-				*a) mode=11a;;
-				*) mode=11g;;
+			case "$agmode" in
+				*b) agmode=11b;;
+				*bg) agmode=11g;;
+				*g) agmode=11g; pureg=1;;
+				*a) agmode=11a;;
+				*) agmode=auto;;
 			esac
-			iwconfig "$ifname" channel 0 
-			iwpriv "$ifname" mode "$mode"
+			iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null 
+			ifconfig "$ifname" up
+			iwpriv "$ifname" mode "$agmode"
 			iwpriv "$ifname" pureg "$pureg"
-			iwconfig "$ifname" channel "$channel"
+			iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
 		}
+	
+		config_get_bool hidden "$vif" hidden
+		iwpriv "$ifname" hide_ssid "$hidden"
 
 		config_get wds "$vif" wds
 		case "$wds" in
@@ -122,7 +127,14 @@ enable_atheros() {
 					iwconfig "$ifname" enc "[$idx]" "${key:-off}"
 				done
 				config_get key "$vif" key
-				iwconfig "$ifname" enc "[${key:-1}]"
+				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
 
@@ -131,12 +143,46 @@ enable_atheros() {
 				config_get addr "$vif" bssid
 				iwpriv "$ifname" wds_add "$addr"
 			;;
-			*)
-				config_get ssid "$vif" ssid
+			adhoc|ahdemo)
+				config_get addr "$vif" bssid
+				[ -z "$addr" ] || { 
+					iwconfig "$ifname" ap "$addr"
+				}
 			;;
 		esac
+		config_get ssid "$vif" ssid
+
+		[ "$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
+
 		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" ] || {
@@ -147,16 +193,44 @@ enable_atheros() {
 		iwconfig "$ifname" essid "$ssid"
 		case "$mode" in
 			ap)
-				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
-				}
+				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)
-				# FIXME: implement wpa_supplicant calls here
+				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 <<EOF
+ctrl_interface=/var/run/wpa_supplicant
+network={
+	scan_ssid=1
+	ssid="$ssid"
+	key_mgmt=WPA-PSK
+	$proto
+	psk="$key"
+}
+EOF
+					;;
+					WPA|wpa|WPA2|wpa2)
+						#add wpa_supplicant calls here
+					;;
+				esac
+				[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
 			;;
 		esac
 		first=0
@@ -167,23 +241,31 @@ enable_atheros() {
 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 <<EOF
 config wifi-device  $dev
 	option type     atheros
 	option channel  5
+#       option diversity 1
+#       option txantenna 0
+#       option rxantenna 0
+#       option distance  2000
+# disable radio to prevent an open ap after reflashing:
+	option disabled 1
+
 
 config wifi-iface
-	option device   $dev
-#	option network	lan
-	option mode     ap
-	option ssid     OpenWrt
-	option hidden   0
+	option device	$dev
+	option network	lan
+	option mode	ap
+	option ssid	OpenWrt
+	option hidden	0
+#	option txpower	15
+#	option bgscan	enable
 	option encryption none
 
 EOF
 	done
 }
-