aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-02-18 13:33:59 +0000
committerJohn Crispin <john@openwrt.org>2014-02-18 13:33:59 +0000
commit26e850dafab44cc42e72123951bfa4064eec1919 (patch)
treebff6a9e5830f85ee6704709ee4bb045f68a0e55a
parentee5cb76c66a237bb82e38c94ba130eacb137ecdd (diff)
downloadupstream-26e850dafab44cc42e72123951bfa4064eec1919.tar.gz
upstream-26e850dafab44cc42e72123951bfa4064eec1919.tar.bz2
upstream-26e850dafab44cc42e72123951bfa4064eec1919.zip
hostapd: add validation rules to wireless handler
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 39620
-rw-r--r--package/network/services/hostapd/files/netifd.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 32bf367c53..f06b2ac784 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -89,7 +89,7 @@ EOF
}
hostapd_common_add_bss_config() {
- config_add_string bssid ssid
+ config_add_string 'bssid:macaddr' 'ssid:string'
config_add_boolean wds wmm hidden
config_add_int maxassoc max_inactivity
@@ -102,9 +102,9 @@ hostapd_common_add_bss_config() {
config_add_boolean rsn_preauth auth_cache
config_add_int ieee80211w
- config_add_string auth_server server
+ config_add_string 'auth_server:host' 'server:host'
config_add_string auth_secret
- config_add_int auth_port port
+ config_add_int 'auth_port:port' 'port:port'
config_add_string acct_server
config_add_string acct_secret
@@ -118,15 +118,15 @@ hostapd_common_add_bss_config() {
config_add_string iapp_interface
config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
- config_add_string key1 key2 key3 key4 password
+ config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
config_add_boolean wps_pushbutton wps_label ext_registrar
config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
config_add_int ieee80211w_max_timeout ieee80211w_retry_timeout
- config_add_string macfilter macfile
- config_add_array maclist
+ config_add_string macfilter 'macfile:file'
+ config_add_array 'maclist:list(macaddr)'
config_add_int mcast_rate
config_add_array basic_rate