X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fluasrc%2Fcbi%2Fdatatypes.lua;h=2039a3516b89d53328258ec7e3fe1dc967c12267;hp=626ad91c756dac87272f5bcf3094b4105cfac087;hb=e4b1bb315606c6c6078a1d3f81eea092762a47e7;hpb=8b8ff639e003598b6af057d2b0ce88f5934df426;ds=sidebyside

diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
index 626ad91c7..2039a3516 100644
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ b/modules/luci-base/luasrc/cbi/datatypes.lua
@@ -131,6 +131,40 @@ function ip6prefix(val)
 	return ( val and val >= 0 and val <= 128 )
 end
 
+function ipmask(val)
+	return ipmask4(val) or ipmask6(val)
+end
+
+function ipmask4(val)
+	local ip, mask = val:match("^([^/]+)/([^/]+)$")
+	local bits = tonumber(mask)
+
+	if bits and bits < 0 or bits > 32 then
+		return false
+	end
+
+	if not bits and not ip4addr(mask) then
+		return false
+	end
+
+	return ip4addr(ip or val)
+end
+
+function ipmask6(val)
+	local ip, mask = val:match("^([^/]+)/([^/]+)$")
+	local bits = tonumber(mask)
+
+	if bits and bits < 0 or bits > 128 then
+		return false
+	end
+
+	if not bits and not ip6addr(mask) then
+		return false
+	end
+
+	return ip6addr(ip or val)
+end
+
 function port(val)
 	val = tonumber(val)
 	return ( val and val >= 0 and val <= 65535 )
@@ -378,29 +412,29 @@ function dateyyyymmdd(val)
 			return false;
 		end
 
-        	local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-
-        	local function is_leap_year(year)
-            		return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0))
-        	end
-
-        	function get_days_in_month(month, year)
-            		if (month == 2) and is_leap_year(year) then
-               			return 29
-            		else
-                		return days_in_month[month]
-            		end
-        	end
-        	if (year < 2015) then
-	    		return false
-        	end 
-        	if ((month == 0) or (month > 12)) then
-            		return false
-        	end 
-        	if ((day == 0) or (day > get_days_in_month(month, year))) then
-            		return false
-        	end
-        	return true
+		local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+
+		local function is_leap_year(year)
+			return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0))
+		end
+
+		function get_days_in_month(month, year)
+			if (month == 2) and is_leap_year(year) then
+				return 29
+			else
+				return days_in_month[month]
+			end
+		end
+		if (year < 2015) then
+			return false
+		end
+		if ((month == 0) or (month > 12)) then
+			return false
+		end
+		if ((day == 0) or (day > get_days_in_month(month, year))) then
+			return false
+		end
+		return true
 	end
 	return false
 end