X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fcbi%2Fdatatypes.lua;h=cf56566287760f0dfb0ecf218b692d807768dc9a;hp=98f6a44d77e7929fadce3b0ad1c494bf677f0dcd;hb=cd8333cf0b90c6498366c993f8135dbd29cd6000;hpb=4e6010cd7301d4f91dc12e368eb5befb6155726b;ds=sidebyside

diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
index 98f6a44d7..cf5656628 100644
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-base/luasrc/cbi/datatypes.lua
@@ -1,4 +1,5 @@
 -- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
+-- Copyright 2017 Dan Luedtke <mail@danrl.com>
 -- Licensed to the public under the Apache License 2.0.
 
 local fs = require "nixio.fs"
@@ -143,7 +144,7 @@ function ipmask4(val)
 		return false
 	end
 
-	if not bits and not ip4addr(mask) then
+	if not bits and mask and not ip4addr(mask) then
 		return false
 	end
 
@@ -158,13 +159,21 @@ function ipmask6(val)
 		return false
 	end
 
-	if not bits and not ip6addr(mask) then
+	if not bits and mask and not ip6addr(mask) then
 		return false
 	end
 
 	return ip6addr(ip or val)
 end
 
+function ip6hostid(val)
+	if val and val:match("^[a-fA-F0-9:]+$") and (#val > 2) then
+		return (ip6addr("2001:db8:0:0" .. val) or ip6addr("2001:db8:0:0:" .. val))
+	end
+
+	return false
+end
+
 function port(val)
 	val = tonumber(val)
 	return ( val and val >= 0 and val <= 65535 )
@@ -267,11 +276,33 @@ function wepkey(val)
 	end
 end
 
+function hexstring(val)
+	if val then
+		return (val:match("^[a-fA-F0-9]+$") ~= nil)
+	end
+	return false
+end
+
+function hex(val, maxbytes)
+	maxbytes = tonumber(maxbytes)
+	if val and maxbytes ~= nil then
+		return ((val:match("^0x[a-fA-F0-9]+$") ~= nil) and (#val <= 2 + maxbytes * 2))
+	end
+	return false
+end
+
+function base64(val)
+	if val then
+		return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0)
+	end
+	return false
+end
+
 function string(val)
 	return true		-- Everything qualifies as valid string
 end
 
-function directory( val, seen )
+function directory(val, seen)
 	local s = fs.stat(val)
 	seen = seen or { }
 
@@ -287,7 +318,7 @@ function directory( val, seen )
 	return false
 end
 
-function file( val, seen )
+function file(val, seen)
 	local s = fs.stat(val)
 	seen = seen or { }
 
@@ -303,7 +334,7 @@ function file( val, seen )
 	return false
 end
 
-function device( val, seen )
+function device(val, seen)
 	local s = fs.stat(val)
 	seen = seen or { }
 
@@ -438,4 +469,3 @@ function dateyyyymmdd(val)
 	end
 	return false
 end
-