summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-08-09 10:03:32 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-08-09 10:03:32 +0000
commita2e93572a9ce37a56e5e4ee138215cfa9391f22d (patch)
tree5b1662d54a1505c76d49a2509d689702311d9e81
parent2026f5388100baf4f2a4d34fd4279a708672dfa5 (diff)
applications/luci-firewall: allow negations in all applicable fields (#468)
-rw-r--r--applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua8
-rw-r--r--applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua2
2 files changed, 5 insertions, 5 deletions
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
index 162767f4d..446563f1c 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
@@ -88,7 +88,7 @@ o = s:option(DynamicList, "src_mac",
translate("Source MAC address"),
translate("Only match incoming traffic from these MACs."))
o.rmempty = true
-o.datatype = "macaddr"
+o.datatype = "neg(macaddr)"
o.placeholder = translate("any")
luci.sys.net.mac_hints(function(mac, name)
@@ -112,7 +112,7 @@ o = s:option(Value, "src_port",
translate("Source port"),
translate("Only match incoming traffic originating from the given source port or port range on the client host"))
o.rmempty = true
-o.datatype = "portrange"
+o.datatype = "neg(portrange)"
o.placeholder = translate("any")
@@ -126,14 +126,14 @@ end)
o.rmempty = true
-o.datatype = "ip4addr"
+o.datatype = "neg(ip4addr)"
o.placeholder = translate("any")
o = s:option(Value, "src_dport", translate("External port"),
translate("Match incoming traffic directed at the given " ..
"destination port or port range on this host"))
-o.datatype = "portrange"
+o.datatype = "neg(portrange)"
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
index 8a8ac3236..0086148c7 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -156,7 +156,7 @@ elseif rule_type == "redirect" then
o.rmempty = true
o.placeholder = translate("any")
- o.datatype = "portrange"
+ o.datatype = "neg(portrange)"
o = s:option(Value, "src_dip",