projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-app-firewall: use new ipmask validation types when applicable
[project/luci.git]
/
applications
/
luci-app-firewall
/
luasrc
/
model
/
cbi
/
firewall
/
zone-details.lua
diff --git
a/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
b/applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
index
6c90476
..
500d1bf
100644
(file)
--- a/
applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/
applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@
-60,7
+60,7
@@
s:tab("advanced", translate("Advanced Settings"))
name = s:taboption("general", Value, "name", translate("Name"))
name.optional = false
name.forcewrite = true
name = s:taboption("general", Value, "name", translate("Name"))
name.optional = false
name.forcewrite = true
-name.datatype = "and(uciname,maxlength(1
4
))"
+name.datatype = "and(uciname,maxlength(1
1
))"
function name.write(self, section, value)
if zone:name() ~= value then
function name.write(self, section, value)
if zone:name() ~= value then
@@
-126,7
+126,7
@@
msrc = s:taboption("advanced", DynamicList, "masq_src",
translate("Restrict Masquerading to given source subnets"))
msrc.optional = true
translate("Restrict Masquerading to given source subnets"))
msrc.optional = true
-msrc.datatype = "list(neg(or(uciname,hostname,ip
4addr
)))"
+msrc.datatype = "list(neg(or(uciname,hostname,ip
mask4
)))"
msrc.placeholder = "0.0.0.0/0"
msrc:depends("family", "")
msrc:depends("family", "ipv4")
msrc.placeholder = "0.0.0.0/0"
msrc:depends("family", "")
msrc:depends("family", "ipv4")
@@
-135,7
+135,7
@@
mdest = s:taboption("advanced", DynamicList, "masq_dest",
translate("Restrict Masquerading to given destination subnets"))
mdest.optional = true
translate("Restrict Masquerading to given destination subnets"))
mdest.optional = true
-mdest.datatype = "list(neg(or(uciname,hostname,ip
4addr
)))"
+mdest.datatype = "list(neg(or(uciname,hostname,ip
mask4
)))"
mdest.placeholder = "0.0.0.0/0"
mdest:depends("family", "")
mdest:depends("family", "ipv4")
mdest.placeholder = "0.0.0.0/0"
mdest:depends("family", "")
mdest:depends("family", "ipv4")