applications/luci-firewall: allow negations in all applicable fields (#468)

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 162767f4db8c3cc82d4d7ed1b0786de86706de7c..446563f1cdf12ec4b100d970a157f6b7c309130a 100644 (file)
--- 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
        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)
 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
        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")
 
 
 o.placeholder = translate("any")
 
 


@@ -126,14 +126,14 @@ end)
 
 
 o.rmempty = true
 
 
 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.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 8a8ac3236c874bf4bb7a78bbec757c8a121f13c0..0086148c76d772cdc483cde6a18419e822bceff1 100644 (file)
--- 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.rmempty = true
        o.placeholder = translate("any")

-       o.datatype = "portrange"
+       o.datatype = "neg(portrange)"

 
 
        o = s:option(Value, "src_dip",
 
 
        o = s:option(Value, "src_dip",