X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2ba38d3a60cb90dc4f5b3cc47e33d10b993a97a6..9765eded20b27f26a13947613ebc4728ab06de35:/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 dd030ba16..0ff929260 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -14,18 +14,17 @@ scan_atheros() {
 		
 		config_get mode "$vif" mode
 		case "$mode" in
-			adhoc|sta|ap)
+			adhoc|ahdemo|sta|ap|monitor)
 				append $mode "$vif"
 			;;
 			wds)
-				config_get addr "$vif" bssid
 				config_get ssid "$vif" ssid
-				[ -z "$addr" -a -n "$ssid" ] && {
-					config_set "$vif" wds 1
-					config_set "$vif" mode sta
-					mode="sta"
-					addr="$ssid"
-				}
+				[ -z "$ssid" ] && continue
+
+				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;;
@@ -35,97 +34,30 @@ 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);;
-		:::);;
+		::);;
 		*) 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 "${sta:+$sta }${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${wds:+$wds }${monitor:+$monitor}"
 }
 
-hostapd_setup_vif() {
-	local vif="$1"
-	local driver="$2"
-	local hostapd_cfg=
-
-	# Examples:
-	# psk-mixed/tkip 	=> WPA1+2 PSK, TKIP
-	# wpa-psk2/tkip+aes	=> WPA2 PSK, CCMP+TKIP
-	# wpa2/tkip+aes 	=> WPA2 RADIUS, CCMP+TKIP
-	# ...
-
-	# TODO: move this parsing function somewhere generic, so that
-	# later it can be reused by drivers that don't use hostapd
-	
-	# crypto defaults: WPA2 vs WPA1
-	case "$enc" in
-		wpa2*|WPA2*|*PSK2*|*psk2*)
-			wpa=2
-			crypto="CCMP"
-		;;
-		*mixed*)
-			wpa=3
-			crypto="CCMP TKIP"
-		;;
-		*) 
-			wpa=1
-			crypto="TKIP"
-		;;
-	esac
-
-	# explicit override for crypto setting
-	case "$enc" in
-		*tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
-		*tkip|*TKIP) crypto="TKIP";;
-		*aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
-	esac
-	
-	# use crypto/auth settings for building the hostapd config
-	case "$enc" in
-		*psk*|*PSK*)
-			config_get psk "$vif" key
-			append hostapd_cfg "wpa_passphrase=$psk" "$N"
-		;;
-		*wpa*|*WPA*)
-		# FIXME: add wpa+radius here
-		;;
-		*)
-			return 0;
-		;;
-	esac
-	config_get ifname "$vif" ifname
-	config_get bridge "$vif" bridge
-	config_get ssid "$vif" ssid
-	cat > /var/run/hostapd-$ifname.conf <<EOF
-driver=$driver
-interface=$ifname
-${bridge:+bridge=$bridge}
-ssid=$ssid
-debug=0
-wpa=$wpa
-wpa_pairwise=$crypto
-$hostapd_cfg
-EOF
-	hostapd -B /var/run/hostapd-$ifname.conf
-}
 
 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
+	set_wifi_down "$device"
 	
 	include /lib/network
 	cd /proc/sys/net
 	for dev in *; do
 		grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
-			ifconfig "$dev" down 
+			[ -f "/var/run/wifi-${dev}.pid" ] &&
+				kill "$(cat "/var/run/wifi-${dev}.pid")"
+			ifconfig "$dev" down
 			unbridge "$dev"
 			wlanconfig "$dev" destroy
 		}
@@ -134,17 +66,25 @@ disable_atheros() (
 )
 
 enable_atheros() {
+	local device="$1"
 	config_get channel "$device" channel
 	config_get vifs "$device" vifs
-	
-	disable_atheros "$device"
+
+	[ auto = "$channel" ] && channel=0
+
+	local first=1
 	for vif in $vifs; do
+		local start_hostapd
 		nosbeacon=
 		config_get ifname "$vif" ifname
 		config_get enc "$vif" encryption
+		config_get eap_type "$vif" eap_type
 		config_get mode "$vif" mode
 		
-		[ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
+		case "$mode" in
+			sta) config_get nosbeacon "$device" nosbeacon;;
+			adhoc) config_get nosbeacon "$vif" sw_merge;;
+		esac
 		
 		config_get ifname "$vif" ifname
 		ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
@@ -154,8 +94,36 @@ enable_atheros() {
 		}
 		config_set "$vif" ifname "$ifname"
 
-		config_get "$device" mode
-		iwpriv "$ifname" mode "${mode:-11g}"
+		# only need to change freq band and channel on the first vif
+		config_get agmode "$device" agmode
+		[ -z "$agmode" ] && config_get agmode "$device" mode
+
+		pureg=0
+		case "$agmode" in
+			*b) agmode=11b;;
+			*bg) agmode=11g;;
+			*g) agmode=11g; pureg=1;;
+			*gdt) agmode=11gdt;;
+			*a) agmode=11a;;
+			*adt) agmode=11adt;;
+			*ast) agmode=11ast;;
+			*fh) agmode=fh;;
+			*) agmode=auto;;
+		esac
+		iwpriv "$ifname" mode "$agmode"
+		iwpriv "$ifname" pureg "$pureg"
+
+		[ "$first" = 1 ] && {
+			iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
+		}
+	
+		config_get_bool hidden "$vif" hidden 0
+		iwpriv "$ifname" hide_ssid "$hidden"
+
+		config_get ff "$vif" ff
+		if [ -n "$ff" ]; then
+			iwpriv "$ifname" ff "$ff"
+		fi
 
 		config_get wds "$vif" wds
 		case "$wds" in
@@ -164,7 +132,11 @@ enable_atheros() {
 		esac
 		iwpriv "$ifname" wds "$wds"
 
-		wpa=
+		[ "$mode" = ap -a "$wds" = 1 ] && {
+			config_get_bool wdssep "$vif" wdssep 1
+			[ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+		}
+
 		case "$enc" in
 			WEP|wep)
 				for idx in 1 2 3 4; do
@@ -172,22 +144,139 @@ 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*|wpa*)
+				start_hostapd=1
+				config_get key "$vif" key
 			;;
 		esac
 
 		case "$mode" in
-			wds)
+			adhoc|ahdemo)
 				config_get addr "$vif" bssid
-				iwpriv "$ifname" wds_add "$addr"
+				[ -z "$addr" ] || { 
+					iwconfig "$ifname" ap "$addr"
+				}
+			;;
+		esac
+		config_get ssid "$vif" ssid
+
+		config_get_bool bgscan "$vif" bgscan
+		[ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan"
+
+		config_get_bool antdiv "$device" diversity
+		config_get antrx "$device" rxantenna
+		config_get anttx "$device" txantenna
+		config_get_bool softled "$device" softled 1
+
+		devname="$(cat /proc/sys/dev/$device/dev_name)"
+		antgpio=
+		case "$devname" in
+			NanoStation2) antgpio=7;;
+			NanoStation5) antgpio=1;;
+		esac
+		if [ -n "$antgpio" ]; then
+			softled=0
+			config_get antenna "$device" antenna
+			case "$antenna" in
+				external) antdiv=0; antrx=1; anttx=1 ;;
+				horizontal) antdiv=0; antrx=1; anttx=1 ;;
+				vertical) antdiv=0; antrx=2; anttx=2 ;;
+				auto) antdiv=1; antrx=0; anttx=0 ;;
+			esac
+			
+			[ -x "$(which gpioctl 2>/dev/null)" ] || antenna=
+			case "$antenna" in
+				horizontal|vertical|auto)
+					gpioctl "dirout" "$antgpio" >/dev/null 2>&1
+					gpioctl "set" "$antgpio" >/dev/null 2>&1
+				;;
+				external)
+					gpioctl "dirout" "$antgpio" >/dev/null 2>&1
+					gpioctl "clear" "$antgpio" >/dev/null 2>&1
+				;;
+			esac
+		fi
+
+		[ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&-
+		[ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&-
+		[ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&-
+		[ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&-
+
+		config_get distance "$device" distance
+		[ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
+
+		config_get txpwr "$vif" txpower
+		[ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
+
+		config_get rate "$vif" rate
+		[ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
+
+		config_get mcast_rate "$vif" mcast_rate
+		[ -n "$mcast_rate" ] && iwpriv "$ifname" mcast_rate "${mcast_rate%%.*}"
+
+		config_get frag "$vif" frag
+		[ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}"
+
+		config_get rts "$vif" rts
+		[ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
+
+		config_get_bool comp "$vif" compression
+		[ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
+
+		config_get_bool minrate "$vif" minrate
+		[ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
+
+		config_get_bool maxrate "$vif" maxrate
+		[ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
+
+		config_get_bool burst "$vif" bursting
+		[ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
+
+		config_get_bool wmm "$vif" wmm
+		[ -n "$wmm" ] && iwpriv "$ifname" wmm "$wmm"
+
+		config_get_bool xr "$vif" xr
+		[ -n "$xr" ] && iwpriv "$ifname" xr "$xr"
+
+		config_get_bool ar "$vif" ar
+		[ -n "$ar" ] && iwpriv "$ifname" ar "$ar"
+
+		config_get_bool turbo "$vif" turbo
+		[ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo"
+
+		config_get_bool doth "$vif" doth 0
+		[ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
+
+		config_get maclist "$vif" maclist
+		[ -n "$maclist" ] && {
+			# flush MAC list
+			iwpriv "$ifname" maccmd 3
+			for mac in $maclist; do
+				iwpriv "$ifname" addmac "$mac"
+			done
+		}
+
+		config_get macpolicy "$vif" macpolicy
+		case "$macpolicy" in
+			allow)
+				iwpriv "$ifname" maccmd 1
+			;;
+			deny)
+				iwpriv "$ifname" maccmd 2
 			;;
 			*)
-				config_get ssid "$vif" ssid
+				# default deny policy if mac list exists
+				[ -n "$maclist" ] && iwpriv "$ifname" maccmd 2
 			;;
 		esac
-		iwconfig "$ifname" channel "$channel"
+
 		ifconfig "$ifname" up
-		
 		local net_cfg bridge
 		net_cfg="$(find_net_config "$vif")"
 		[ -z "$net_cfg" ] || {
@@ -195,21 +284,36 @@ enable_atheros() {
 			config_set "$vif" bridge "$bridge"
 			start_net "$ifname" "$net_cfg"
 		}
+		[ -n "$ssid" ] && iwconfig "$ifname" essid on
+		iwconfig "$ifname" essid "$ssid"
+		set_wifi_up "$vif" "$ifname"
 		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 [ -n "$start_hostapd" ] && eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+					hostapd_setup_vif "$vif" madwifi || {
+						echo "enable_atheros($device): Failed to set up hostapd 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)
-				iwconfig "$ifname" essid "$ssid"
-				# FIXME: implement wpa_supplicant calls here
+				if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+					wpa_supplicant_setup_vif "$vif" madwifi || {
+						echo "enable_atheros($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+						ifconfig "$ifname" down
+						wlanconfig "$ifname" destroy
+						continue
+					}
+				fi
 			;;
 		esac
+		first=0
 	done
 }
 
@@ -217,23 +321,32 @@ 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
+		devname="$(cat /proc/sys/dev/$dev/dev_name)"
+		case "$devname" in
+			NanoStation*)
+				EXTRA_DEV="
+# Ubiquiti NanoStation features
+	option antenna	auto # (auto|horizontal|vertical|external)
+"
+			;;
+		esac
 		[ "$type" = atheros ] && return
 		cat <<EOF
 config wifi-device  $dev
 	option type     atheros
-	option channel  5
+	option channel  auto
+$EXTRA_DEV
+	# REMOVE THIS LINE TO ENABLE WIFI:
+	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 encryption none
-
 EOF
 	done
 }
-