diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-05 15:09:26 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-05 15:09:26 +0000 |
| commit | 6e29b97896d2035f0981c12764f10791ada6a1be (patch) | |
| tree | 23a51acb0938647f86ca5f500754547dcb0075ed | |
| parent | 198ea09e92556752658bbfffac2b764b6f80959c (diff) | |
[package] hostapd: add accounting configuration to hostapd uci script
Hello
This patch add accounting configuration in hostapd.sh
It also change "server, port, key" to "auth_server, auth_port, auth_secret" but keep backward compatibility
Please patch backfire & trunk
Thanks in advance.
Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26482 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/hostapd/files/hostapd.sh | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index 5b69ecd62..29d8c7297 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -68,13 +68,23 @@ hostapd_set_bss_options() { *wpa*) # required fields? formats? # hostapd is particular, maybe a default configuration for failures - config_get server "$vif" server - append "$var" "auth_server_addr=$server" "$N" - config_get port "$vif" port - port=${port:-1812} - append "$var" "auth_server_port=$port" "$N" - config_get secret "$vif" key - append "$var" "auth_server_shared_secret=$secret" "$N" + config_get auth_server "$vif" auth_server + [ -z "$auth_server" ] && config_get auth_server "$vif" server + append "$var" "auth_server_addr=$auth_server" "$N" + config_get auth_port "$vif" auth_port + [ -z "$auth_port" ] && config_get auth_port "$vif" port + auth_port=${auth_port:-1812} + append "$var" "auth_server_port=$auth_port" "$N" + config_get auth_secret "$vif" auth_secret + [ -z "$auth_secret" ] && config_get auth_secret "$vif" key + append "$var" "auth_server_shared_secret=$auth_secret" "$N" + config_get acct_server "$vif" acct_server + [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N" + config_get acct_port "$vif" acct_port + [ -n "$acct_port" ] && acct_port=${acct_port:-1813} + [ -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 nasid "$vif" nasid append "$var" "nas_identifier=$nasid" "$N" append "$var" "eapol_key_index_workaround=1" "$N" |