Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a typo for broadcom maclist, Improved general maclist handling

Browse source
This commit is contained in:
Steven Barth 2008-09-19 10:42:18 +00:00
parent 712424dc0c
commit 1c7cc8501c
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/uvl/root/lib/uci/schema/default/wireless
View file

@ -104,19 +104,19 @@ config variable
list depends type=broadcom list depends type=broadcom
config variable config variable
option name 'macpolicy' option name 'macfilter'
option section 'wireless.wifi-device' option section 'wireless.wifi-device'
option title 'MAC-Address Filter (broadcom)' option title 'MAC-Address Filter (broadcom)'
option type enum option type enum
list depends type=broadcom list depends type=broadcom
config enum config enum
option variable 'wireless.wifi-device.macpolicy' option variable 'wireless.wifi-device.macfilter'
option value 'deny' option value 'deny'
option title 'Allow listed only' option title 'Allow listed only'
config enum config enum
option variable 'wireless.wifi-device.macpolicy' option variable 'wireless.wifi-device.macfilter'
option value 'allow' option value 'allow'
option title 'Allow all except listed' option title 'Allow all except listed'
@ -124,9 +124,9 @@ config variable
option name 'maclist' option name 'maclist'
option section 'wireless.wifi-device' option section 'wireless.wifi-device'
option title 'MAC-List (broadcom)' option title 'MAC-List (broadcom)'
list depends 'type=broadcom, macpolicy=allow' list depends 'type=broadcom, macfilter=allow'
list depends 'type=broadcom, macpolicy=deny' list depends 'type=broadcom, macfilter=deny'
option multival true option type lazylist
option datatype macaddr option datatype macaddr
config variable config variable
@ -308,6 +308,8 @@ config variable
option title 'MAC-List (atheros)' option title 'MAC-List (atheros)'
list depends 'macpolicy=allow' list depends 'macpolicy=allow'
list depends 'macpolicy=deny' list depends 'macpolicy=deny'
option type lazylist
option datatype macaddr
config variable config variable
option name 'rate' option name 'rate'

10
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -79,14 +79,14 @@ end
------------------- Broadcom Device ------------------ ------------------- Broadcom Device ------------------
if hwtype == "broadcom" then if hwtype == "broadcom" then
mp = s:option(ListValue, "macpolicy", translate("wifi_macpolicy")) mp = s:option(ListValue, "macfilter", translate("wifi_macpolicy"))
mp.optional = true mp.optional = true
mp:value("") mp:value("")
mp:value("deny", translate("wifi_whitelist")) mp:value("deny", translate("wifi_whitelist"))
mp:value("allow", translate("wifi_blacklist")) mp:value("allow", translate("wifi_blacklist"))
ml = s:option(Value, "maclist", translate("wifi_maclist")) ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
ml:depends({macpolicy="allow"}) ml:depends({macfilter="allow"})
ml:depends({macpolicy="deny"}) ml:depends({macfilter="deny"})
s:option(Value, "txant", translate("wifi_txantenna")).optional = true s:option(Value, "txant", translate("wifi_txantenna")).optional = true
s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true
@ -190,7 +190,7 @@ if hwtype == "atheros" then
mp:value("") mp:value("")
mp:value("deny", translate("wifi_whitelist")) mp:value("deny", translate("wifi_whitelist"))
mp:value("allow", translate("wifi_blacklist")) mp:value("allow", translate("wifi_blacklist"))
ml = s:option(Value, "maclist", translate("wifi_maclist")) ml = s:option(DynamicList, "maclist", translate("wifi_maclist"))
ml:depends({macpolicy="allow"}) ml:depends({macpolicy="allow"})
ml:depends({macpolicy="deny"}) ml:depends({macpolicy="deny"})