X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/de911eea1ae72b46a42aa2c9c17d3249d31e21b9..9e97fe261db0c03effd31865eea9f8759a4f2f16:/package/hostapd/files/hostapd.sh?ds=sidebyside

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 660a90c3e..a2f2d6fd1 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -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?
@@ -62,22 +66,38 @@ hostapd_setup_vif() {
 			append hostapd_cfg "wpa_gmk_rekey=640" "$N"
 		;;
 		*)
-			return 0;
+			wpa=0
+			crypto=
 		;;
 	esac
 	config_get ifname "$vif" ifname
 	config_get bridge "$vif" bridge
 	config_get ssid "$vif" ssid
+	config_get device "$vif" device
+	config_get channel "$device" channel
+	config_get hwmode "$device" hwmode
+	case "$hwmode" in
+		11a) hwmode=a;;
+		11b) hwmode=b;;
+		11g) hwmode=g;;
+		*)
+			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=${hwmode:-g}
+channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
 $hostapd_cfg
 EOF
-	hostapd -B /var/run/hostapd-$ifname.conf
+	hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
 }