Fix hostapd with open access point and per-device configuration, thanks sn9

[openwrt.git] / package / hostapd / files / hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 570f2ed..147736b 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -38,22 +38,43 @@ hostapd_setup_vif() {
        # use crypto/auth settings for building the hostapd config
        case "$enc" in
                *psk*|*PSK*)
-                       config_get psk "$vif" psk
+                       config_get psk "$vif" key
                        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