X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fcbi%2Fdatatypes.lua;h=3c768ab7623e03885eb8a3b735541d7b1a0d2e5e;hb=c5811d52d0dbcf059418462ae983aaa09aa076b5;hp=2fdb5802c409051e9f507b83318448aeefc6e0b3;hpb=c20dcb3612de13eeb870de31d83e816d93bdc830;p=project%2Fluci.git

diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index 2fdb5802c..3c768ab76 100644
--- 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"
 
@@ -35,7 +35,7 @@ function bool(val)
 	return false
 end
 
-function uint(val)
+function uinteger(val)
 	local n = tonumber(val)
 	if n ~= nil and math.floor(n) == n and n >= 0 then
 		return true
@@ -44,7 +44,7 @@ function uint(val)
 	return false
 end
 
-function int(val)
+function integer(val)
 	local n = tonumber(val)
 	if n ~= nil and math.floor(n) == n then
 		return true
@@ -53,6 +53,11 @@ function int(val)
 	return false
 end
 
+function ufloat(val)
+	local n = tonumber(val)
+	return ( n ~= nil and n >= 0 )
+end
+
 function float(val)
 	return ( tonumber(val) ~= nil )
 end
@@ -61,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
@@ -69,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 )
@@ -89,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)
@@ -122,10 +141,12 @@ function macaddr(val)
 end
 
 function hostname(val)
-	if val and val:match("[a-zA-Z0-9_][a-zA-Z0-9_%-%.]*") then
-		return true	-- XXX: ToDo: need better solution
+	if val and (#val < 254) and (
+	   val:match("^[a-zA-Z0-9]+$") or
+	   val:match("^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$")
+	) then
+		return true
 	end
-
 	return false
 end
 
@@ -149,7 +170,7 @@ function wepkey(val)
 	if (#val == 10) or (#val == 26) then
 		return (val:match("^[a-fA-F0-9]+$") ~= nil)
 	else
-		return (#v == 5) or (#v == 13)
+		return (#val == 5) or (#val == 13)
 	end
 end
 
@@ -209,6 +230,13 @@ function uciname(val)
 	return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
 end
 
+function neg_network_ip4addr(val)
+	if type(v) == "string" then
+		v = v:gsub("^%s*!", "")
+		return (uciname(v) or ip4addr(v))
+	end	
+end
+
 function range(val, min, max)
 	val = tonumber(val)
 	min = tonumber(min)
@@ -220,3 +248,33 @@ function range(val, min, max)
 
 	return false
 end
+
+function min(val, min)
+	val = tonumber(val)
+	min = tonumber(min)
+
+	if val ~= nil and min ~= nil then
+		return (val >= min)
+	end
+
+	return false
+end
+
+function max(val, max)
+	val = tonumber(val)
+	max = tonumber(max)
+
+	if val ~= nil and max ~= nil then
+		return (val <= max)
+	end
+
+	return false
+end
+
+function neg(val, what)
+	if what and type(_M[what]) == "function" then
+		return _M[what](val:gsub("^%s*!%s*", ""))
+	end
+
+	return false
+end