X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/982604693e5d59d2e47a11af1ab39679c57f6e0f..17d1b91a9611b9278c926e82c9be938ade02d095:/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 5a47f7019..284c6609c 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -18,14 +18,13 @@ scan_atheros() {
 				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;;
@@ -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
@@ -104,7 +104,11 @@ enable_atheros() {
 				*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"
@@ -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"
 
@@ -300,11 +302,49 @@ network={
 }
 EOF
 					;;
-					WPA|wpa|WPA2|wpa2)
-						#add wpa_supplicant calls here
+					WPA|wpa|WPA2|wpa2i|8021x|8021X)
+						config_get ca_cert "$vif" ca_cert
+						eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')
+						case "$eap_type" in
+							tls|TLS)
+								proto='proto=WPA2'
+								pairwise='pairwise=CCMP'
+								group='group=CCMP'
+								config_get priv_key "$vif" priv_key
+								config_get priv_key_pwd "$vif" priv_key_pwd
+								priv_key="private_key=\"$priv_key\""
+								priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
+							;;
+							peap|PEAP|ttls|TTLS)
+								proto='proto=WPA2'
+								config_get auth "$vif" auth
+								config_get identity "$vif" identity
+								config_get password "$vif" password
+								phase2="phase2=\"auth=${auth:-MSCHAPV2}\""
+								identity="identity=\"$identity\""
+								password="password=\"$password\""
+							;;
+						esac
+						cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
+network={
+	scan_ssid=1
+	ssid="$ssid"
+	key_mgmt=WPA-EAP
+	$proto
+	$pairwise
+	$group
+	eap=$eap_type
+	ca_cert="$ca_cert"
+	$priv_key
+	$priv_key_pwd
+	$phase2
+	$identity
+	$password
+}
+EOF
 					;;
 				esac
-				[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+				[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
 			;;
 		esac
 		first=0