hostapd: add a build variant for wpa_supplicant with p2p (aka Wi-Fi Direct) support

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

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 8d6f30538d3fdefb2642a6c0534875e961855c2c..e25e870aa24c1208c85c826789043eb3e01c35fb 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -108,6 +108,13 @@ hostapd_set_bss_options() {
                        [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N"
                        config_get acct_secret "$vif" acct_secret
                        [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N"
+                       config_get dae_client "$vif" dae_client
+                       config_get dae_secret "$vif" dae_secret
+                       [ -n "$dae_client" -a -n "$dae_secret" ] && {
+                               config_get dae_port  "$vif" dae_port
+                               append "$var" "radius_das_port=${dae_port:-3799}" "$N"
+                               append "$var" "radius_das_client=$dae_client $dae_secret" "$N"
+                       }
                        config_get nasid "$vif" nasid
                        append "$var" "nas_identifier=$nasid" "$N"
                        append "$var" "eapol_key_index_workaround=1" "$N"
@@ -220,7 +227,9 @@ hostapd_set_bss_options() {
        if [ -z "$macfile" ]
        then
                # if no macfile has been specified, fallback to the default name
+               # and truncate file to avoid aggregating entries over time
                macfile="/var/run/hostapd-$ifname.maclist"
+               echo "" > "$macfile"
        else
                if [ -n "$maclist" ]
                then