X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2b63bfb4972e56e7b4b0930c34d9f0e7b3891a1b..09f00dd10adb0d5ee0f4257f27ad534aae89e1e4:/package/hostapd/files/hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 570f2ed07..a07883831 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"
 		;;
@@ -38,29 +38,73 @@ hostapd_setup_vif() {
 	# use crypto/auth settings for building the hostapd config
 	case "$enc" in
 		*psk*|*PSK*)
-			config_get psk "$vif" psk
-			append hostapd_cfg "wpa_passphrase=$psk" "$N"
+			config_get psk "$vif" key
+			if [ ${#psk} -eq 64 ]; then
+				append hostapd_cfg "wpa_psk=$psk" "$N"
+			else
+				append hostapd_cfg "wpa_passphrase=$psk" "$N"
+			fi
 		;;
 		*wpa*|*WPA*)
-		# FIXME: add wpa+radius here
+		        # required fields? formats?
+		        # hostapd is particular, maybe a default configuration for failures
+			config_get server "$vif" server
+			append hostapd_cfg "auth_server_addr=$server" "$N"
+			config_get port "$vif" port
+			port=${port:-1812}
+			append hostapd_cfg "auth_server_port=$port" "$N"
+			config_get secret "$vif" key
+			append hostapd_cfg "auth_server_shared_secret=$secret" "$N"
+			config_get nasid "$vif" nasid
+			append hostapd_cfg "nas_identifier=$nasid" "$N"
+			append hostapd_cfg "eapol_key_index_workaround=1" "$N"
+			append hostapd_cfg "radius_acct_interim_interval=300" "$N"
+			append hostapd_cfg "ieee8021x=1" "$N"
+			append hostapd_cfg "auth_algs=1" "$N"
+			append hostapd_cfg "wpa_key_mgmt=WPA-EAP" "$N"
+			append hostapd_cfg "wpa_group_rekey=300" "$N"
+			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
+		bg) hwmode=g;;
+	esac
+	config_get country "$device" country
+	[ "$channel" = auto ] && channel=
+	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
+	[ -n "$hwmode" ] && {
+		config_get hwmode_11n "$device" hwmode_11n
+		[ -n "$hwmode_11n" ] && {
+			hwmode="$hwmode_11n"
+			config_get ht_capab "$device" ht_capab
+		}
+	}
 	cat > /var/run/hostapd-$ifname.conf <<EOF
+ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
+${hwmode:+hw_mode=$hwmode}
+${channel:+channel=$channel}
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
+${hwmode_11n:+ieee80211n=1}
+${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
 }