luci-firewall: Add support for negations for ip addresses/nets (#218)

[project/luci.git] / libs / web / luasrc / cbi / datatypes.lua

diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index 58b54de..d4603cf 100644 (file)
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -17,8 +17,8 @@ local fs = require "nixio.fs"
 local ip = require "luci.ip"
 local math = require "math"
 local util = require "luci.util"
+local tonumber, type = tonumber, type
 
-local tonumber = tonumber
 
 module "luci.cbi.datatypes"
 
@@ -66,6 +66,13 @@ function ipaddr(val)
        return ip4addr(val) or ip6addr(val)
 end
 
+function neg_ipaddr(v)
+       if type(v) == "string" then
+               v = v:gsub("^%s*!", "")
+       end
+       return v and ipaddr(v)
+end
+
 function ip4addr(val)
        if val then
                return ip.IPv4(val) and true or false
@@ -74,6 +81,13 @@ function ip4addr(val)
        return false
 end
 
+function neg_ip4addr(v)
+       if type(v) == "string" then
+               v = v:gsub("^%s*!", "")
+       end
+               return v and ip4addr(v)
+end
+
 function ip4prefix(val)
        val = tonumber(val)
        return ( val and val >= 0 and val <= 32 )
@@ -94,7 +108,7 @@ end
 
 function port(val)
        val = tonumber(val)
-       return ( val and val >= 1 and val <= 65535 )
+       return ( val and val >= 0 and val <= 65535 )
 end
 
 function portrange(val)