From 94d6b7b70d858c33ec0feabd22733c05c9fb529f Mon Sep 17 00:00:00 2001 From: danrl Date: Wed, 15 Feb 2017 07:46:38 +0100 Subject: [PATCH] luci-base: added dhcpv6 datatypes Signed-off-by: Dan Luedtke --- modules/luci-base/luasrc/cbi/datatypes.lua | 31 ++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua index 0a180d3664..62b0e0f617 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 +-- Copyright 2017 Dan Luedtke -- Licensed to the public under the Apache License 2.0. local fs = require "nixio.fs" @@ -165,6 +166,14 @@ function ipmask6(val) 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 ) @@ -268,17 +277,24 @@ function wepkey(val) end function hexstring(val) - if val then - return (val:match("^[a-fA-F0-9]+$") ~= nil) - end - return false + if val then + return (val:match("^[a-fA-F0-9]+$") ~= nil) + 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 { } @@ -294,7 +310,7 @@ function directory( val, seen ) return false end -function file( val, seen ) +function file(val, seen) local s = fs.stat(val) seen = seen or { } @@ -310,7 +326,7 @@ function file( val, seen ) return false end -function device( val, seen ) +function device(val, seen) local s = fs.stat(val) seen = seen or { } @@ -445,4 +461,3 @@ function dateyyyymmdd(val) end return false end - -- 2.30.2