Author: nbd Date: 2015-03-27 00:34:10 +0100 (Fri, 27 Mar 2015) New Revision: 45049
Modified: trunk/package/network/services/hostapd/files/hostapd.sh trunk/package/network/services/hostapd/files/netifd.sh Log: 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 <[email protected]> Modified: trunk/package/network/services/hostapd/files/hostapd.sh =================================================================== --- trunk/package/network/services/hostapd/files/hostapd.sh 2015-03-26 23:34:01 UTC (rev 45048) +++ trunk/package/network/services/hostapd/files/hostapd.sh 2015-03-26 23:34:10 UTC (rev 45049) @@ -129,9 +129,7 @@ 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 @@ [ -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 Modified: trunk/package/network/services/hostapd/files/netifd.sh =================================================================== --- trunk/package/network/services/hostapd/files/netifd.sh 2015-03-26 23:34:01 UTC (rev 45048) +++ trunk/package/network/services/hostapd/files/netifd.sh 2015-03-26 23:34:10 UTC (rev 45049) @@ -239,7 +239,7 @@ auth_server auth_secret auth_port \ acct_server acct_secret acct_port \ dae_client dae_secret dae_port \ - nasid ownip \ + ownip \ eap_reauth_period dynamic_vlan \ vlan_naming vlan_tagged_interface \ vlan_bridge @@ -273,7 +273,6 @@ append bss_conf "radius_das_client=$dae_client $dae_secret" "$N" } - append bss_conf "nas_identifier=$nasid" "$N" [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N" append bss_conf "eapol_key_index_workaround=1" "$N" append bss_conf "ieee8021x=1" "$N" @@ -339,6 +338,11 @@ [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N" } + if [ "$wpa" -ge "1" ]; then + json_get_vars nasid + [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N" + fi + if [ "$wpa" -ge "2" ]; then if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then set_default auth_cache 1 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
