aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Shvedov <yshvedov@wimarksystems.com>2017-06-27 11:43:54 +0300
committerJo-Philipp Wich <jo@mein.io>2017-12-13 16:23:38 +0100
commit0e6a6c84873e8fc9367d0766ced71e0db662e377 (patch)
treeef8dba1e53cec12cf72d15dabda8a420b82819b4
parentef3649d90e0b799a3a6efc45a77ae1d1719c9842 (diff)
downloadupstream-0e6a6c84873e8fc9367d0766ced71e0db662e377.tar.gz
upstream-0e6a6c84873e8fc9367d0766ced71e0db662e377.tar.bz2
upstream-0e6a6c84873e8fc9367d0766ced71e0db662e377.zip
hostapd: configure NAS ID regardless of encryption
RADIUS protocol could be used not only for authentication but for accounting too. Accounting could be configured for any type of networks. However there is no way to configure NAS Identifier for non-WPA networks without this patch. Signed-off-by: Yury Shvedov <yshvedov@wimarksystems.com> [cleanup commit message] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> (cherry picked from commit 37c1513b1f98c93bf84bbcedd9782568e7d4abba)
-rw-r--r--package/network/services/hostapd/files/hostapd.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index d42b6a036f..9ad7610c97 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -212,7 +212,7 @@ hostapd_set_bss_options() {
wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 wps_ap_setup_locked \
wps_independent wps_device_type wps_device_name wps_manufacturer wps_pin \
macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
- iapp_interface eapol_version dynamic_vlan ieee80211w \
+ iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
acct_server acct_secret acct_port acct_interval
set_default isolate 0
@@ -253,6 +253,7 @@ hostapd_set_bss_options() {
[ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey" "$N"
}
+ [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
[ -n "$acct_server" ] && {
append bss_conf "acct_server_addr=$acct_server" "$N"
append bss_conf "acct_server_port=$acct_port" "$N"
@@ -380,9 +381,8 @@ hostapd_set_bss_options() {
}
if [ "$wpa" -ge "1" ]; then
- json_get_vars nasid ieee80211r
+ json_get_vars ieee80211r
set_default ieee80211r 0
- [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
if [ "$ieee80211r" -gt "0" ]; then
json_get_vars mobility_domain r0_key_lifetime r1_key_holder \