From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 21 Feb 2014 00:17:04 +0000 (+0000)
Subject: netifd: fix validation constraints
X-Git-Tag: reboot~7886
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=commitdiff_plain;h=354efde275c8e9b710504a013b2ebe8af74fa1ca

netifd: fix validation constraints

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 39648
---

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index 848336f4fa..db07c1e664 100755
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -57,12 +57,12 @@ validate_route_section()
 {
 	uci_validate_section network route "${1}" \
 		'interface:string' \
-		'target:ip4addr' \
-		'netmask:ip4prefix' \
+		'target:cidr4' \
+		'netmask:netmask4' \
 		'gateway:ip4addr' \
 		'metric:uinteger' \
 		'mtu:uinteger' \
-		'table:range(0,65535)'
+		'table:or(range(0,65535),string)'
 
 	return $?
 }
@@ -71,11 +71,11 @@ validate_route6_section()
 {
 	uci_validate_section network route6 "${1}" \
 		'interface:string' \
-		'target:ip6addr' \
+		'target:cidr6' \
 		'gateway:ip6addr' \
 		'metric:uinteger' \
 		'mtu:uinteger' \
-		'table:range(0,65535)'
+		'table:or(range(0,65535),string)'
 
 	return $?
 }
@@ -85,12 +85,12 @@ validate_rule_section()
 	uci_validate_section network rule "${1}" \
 		'in:string' \
 		'out:string' \
-		'src:ip4prefix' \
-		'dest:ip4prefix' \
-		'tos:rage(0.31)' \
-		'string:mark' \
+		'src:cidr4' \
+		'dest:cidr4' \
+		'tos:range(0,31)' \
+		'mark:string' \
 		'invert:bool' \
-		'lookup:range(0,65535)' \
+		'lookup:or(range(0,65535),string)' \
 		'goto:range(0,65535)' \
 		'action:or("prohibit", "unreachable", "blackhole", "throw")'
 
@@ -102,12 +102,12 @@ validate_rule6_section()
 	uci_validate_section network rule6 "${1}" \
 		'in:string' \
 		'out:string' \
-		'src:ip4prefix' \
-		'dest:ip4prefix' \
-		'tos:rage(0.31)' \
-		'string:mark' \
+		'src:cidr6' \
+		'dest:cidr6' \
+		'tos:range(0,31)' \
+		'mark:string' \
 		'invert:bool' \
-		'lookup:range(0,65535)' \ 
+		'lookup:or(range(0,65535),string)' \
 		'goto:range(0,65535)' \
 		'action:or("prohibit", "unreachable", "blackhole", "throw")'