Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: backport cbi datatype changes

Browse source 
Backport the new cbi datatypes and whitespace fixes from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2017-02-28 16:22:52 +02:00
parent a100738163
commit 12f98db8ba
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/luci-base/luasrc/cbi/datatypes.lua
View file

@ -165,6 +165,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,10 +276,25 @@ 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 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)