X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c352f2f98116127f5273363c1f3770427f632646..ce140e52cbc4f2b2618f325c2d857d4df2c89510:/package/hostapd/files/hostapd.sh?ds=inline

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 529462e6c..147736bdc 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -11,7 +11,7 @@ hostapd_setup_vif() {
 
 	# TODO: move this parsing function somewhere generic, so that
 	# later it can be reused by drivers that don't use hostapd
-	
+
 	# crypto defaults: WPA2 vs WPA1
 	case "$enc" in
 		wpa2*|WPA2*|*PSK2*|*psk2*)
@@ -34,7 +34,7 @@ hostapd_setup_vif() {
 		*tkip|*TKIP) crypto="TKIP";;
 		*aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
 	esac
-	
+
 	# use crypto/auth settings for building the hostapd config
 	case "$enc" in
 		*psk*|*PSK*)
@@ -42,18 +42,39 @@ hostapd_setup_vif() {
 			append hostapd_cfg "wpa_passphrase=$psk" "$N"
 		;;
 		*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
 		;;
 	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
 	cat > /var/run/hostapd-$ifname.conf <<EOF
 driver=$driver
 interface=$ifname
+hw_mode=g
+channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0