X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/aebad6eecf98f6c1ba8312062877ea4c769203b1..18e4940bcba475ee0829d1d8695758f947eaa5d8:/package/madwifi/files/lib/wifi/madwifi.sh?ds=inline

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 5adeee44b..bec72383b 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|ahdemo|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;;
@@ -43,7 +42,7 @@ scan_atheros() {
 		*) echo "$device: Invalid mode combination in config"; return 1;;
 	esac
 
-	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
+	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
 }
 
 
@@ -82,6 +81,7 @@ enable_atheros() {
 		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
@@ -97,19 +97,23 @@ enable_atheros() {
 		[ "$first" = 1 ] && {
 			# 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
-			iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
 			iwpriv "$ifname" mode "$agmode"
 			iwpriv "$ifname" pureg "$pureg"
 			iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-			ifconfig "$ifname" up
 		}
 	
 		config_get_bool hidden "$vif" hidden 0
@@ -127,6 +131,11 @@ enable_atheros() {
 		esac
 		iwpriv "$ifname" wds "$wds"
 
+		[ "$mode" = ap -a "$wds" = 1 ] && {
+			config_get_bool wdssep "$vif" wdssep 1
+			[ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+		}
+
 		wpa=
 		case "$enc" in
 			WEP|wep)
@@ -147,10 +156,6 @@ enable_atheros() {
 		esac
 
 		case "$mode" in
-			wds)
-				config_get addr "$vif" bssid
-				iwpriv "$ifname" wds_add "$addr"
-			;;
 			adhoc|ahdemo)
 				config_get addr "$vif" bssid
 				[ -z "$addr" ] || { 
@@ -190,9 +195,6 @@ enable_atheros() {
 		config_get rts "$vif" rts
 		[ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
 
-		config_get_bool doth "$vif" 80211h
-		[ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
-
 		config_get_bool comp "$vif" compression
 		[ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
 
@@ -244,8 +246,6 @@ enable_atheros() {
 		esac
 
 		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" ] || {
@@ -262,7 +262,7 @@ enable_atheros() {
 
 				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
+						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
@@ -271,42 +271,14 @@ enable_atheros() {
 				fi
 			;;
 			wds|sta)
-				config_get_bool usepassphrase "$vif" passphrase 1
-				case "$enc" in
-					PSK|psk|PSK2|psk2)
-						case "$enc" in
-							PSK|psk)
-								proto='proto=WPA'
-								if [ "$usepassphrase" = "1" ]; then
-									passphrase="psk=\"${key}\""
-								else
-									passphrase="psk=${key}"
-								fi
-								;;
-							PSK2|psk2)
-								proto='proto=RSN'
-                                                                if [ "$usepassphrase" = "1" ]; then
-                                                                        passphrase="psk=\"${key}\""
-                                                                else
-                                                                        passphrase="psk=${key}"
-                                                                fi
-								;;
-						esac
-						cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-network={
-	scan_ssid=1
-	ssid="$ssid"
-	key_mgmt=WPA-PSK
-	$proto
-	$passphrase
-}
-EOF
-					;;
-					WPA|wpa|WPA2|wpa2)
-						#add wpa_supplicant calls here
-					;;
-				esac
-				[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+				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