From 4482d10a04cfe0a3fdb4e6d47c50301ebd30e1c4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 26 Mar 2015 23:34:10 +0000 Subject: hostapd: append nasid to config for all WPA types The 802.11r implementation in hostapd uses nas_identifier as PMK-R0 Key Holder identifier. As 802.11r can also be used with WPA Personal, nasid should be appended to the hostapd config for all WPA types. Signed-off-by: Stijn Tintel SVN-Revision: 45049 --- package/network/services/hostapd/files/hostapd.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '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 b8ba7bdf05..2a38d16255 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -129,9 +129,7 @@ hostapd_set_bss_options() { append "$var" "radius_das_port=${dae_port:-3799}" "$N" append "$var" "radius_das_client=$dae_client $dae_secret" "$N" } - config_get nasid "$vif" nasid config_get ownip "$vif" ownip - append "$var" "nas_identifier=$nasid" "$N" append "$var" "own_ip_addr=$ownip" "$N" append "$var" "eapol_key_index_workaround=1" "$N" append "$var" "ieee8021x=1" "$N" @@ -216,6 +214,12 @@ hostapd_set_bss_options() { [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N" [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N" + if [ "$wpa" -ge "1" ] + then + config_get nasid "$vif" nasid + [ -n "$nasid" ] && append "$var" "nas_identifier=$nasid" "$N" + fi + if [ "$wpa" -ge "2" ] then # RSN -> allow preauthentication. You have two -- cgit v1.2.3