X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ce140e52cbc4f2b2618f325c2d857d4df2c89510..8cfceab612ec83d1d3e3602ca5d3dec3dbb7ecc6:/package/hostapd/files/hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 147736bdc..afd72fa1a 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -22,7 +22,7 @@ hostapd_setup_vif() {
 			wpa=3
 			crypto="CCMP TKIP"
 		;;
-		*) 
+		*)
 			wpa=1
 			crypto="TKIP"
 		;;
@@ -39,7 +39,11 @@ hostapd_setup_vif() {
 	case "$enc" in
 		*psk*|*PSK*)
 			config_get psk "$vif" key
-			append hostapd_cfg "wpa_passphrase=$psk" "$N"
+			if [ ${#psk} -eq 64 ]; then
+				append hostapd_cfg "wpa_psk=$psk" "$N"
+			else
+				append hostapd_cfg "wpa_passphrase=$psk" "$N"
+			fi
 		;;
 		*wpa*|*WPA*)
 		        # required fields? formats?
@@ -63,6 +67,7 @@ hostapd_setup_vif() {
 		;;
 		*)
 			wpa=0
+			crypto=
 		;;
 	esac
 	config_get ifname "$vif" ifname
@@ -70,18 +75,37 @@ hostapd_setup_vif() {
 	config_get ssid "$vif" ssid
 	config_get device "$vif" device
 	config_get channel "$device" channel
+	config_get hwmode "$device" hwmode
+	config_get country "$device" country
+	case "$hwmode" in
+		11a) hwmode=a;;
+		11b) hwmode=b;;
+		11g) hwmode=g;;
+		11n)
+			hwmode=g
+			append hostapd_cfg "ieee80211n=1" "$N"
+			config_get ht_capab "$device" ht_capab
+		;;
+		*)
+			hwmode=
+			[ "$channel" -gt 14 ] && hwmode=a
+		;;
+	esac
 	cat > /var/run/hostapd-$ifname.conf <<EOF
+ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
-hw_mode=g
+hw_mode=${hwmode:-g}
 channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
+${ht_capab:+ht_capab=$ht_capab}
 $hostapd_cfg
 EOF
-	hostapd -B /var/run/hostapd-$ifname.conf
+	hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
 }