From: John Crispin <john@openwrt.org>
Date: Tue, 18 Feb 2014 13:34:04 +0000 (+0000)
Subject: netifd: add validation support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8fb44e0d1ec60393b76cf31427b0d2db1893e5d8;p=openwrt%2Fstaging%2Fynezz.git

netifd: add validation support

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 39621
---

diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index e117463ad1..848336f4fa 100755
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -40,12 +40,117 @@ service_running() {
 	/sbin/wifi reload_legacy
 }
 
+validate_atm_bridge_section()
+{
+	uci_validate_section network "atm-bridge" "${1}" \
+		'unit:uinteger:0' \
+		'vci:range(32, 65535):35' \
+		'vpi:range(0, 255):8' \
+		'atmdev:uinteger:0' \
+		'encaps:or("llc", "vc"):llc' \
+		'payload:or("bridged", "routed"):bridged'
+
+	return $?
+}
+
+validate_route_section()
+{
+	uci_validate_section network route "${1}" \
+		'interface:string' \
+		'target:ip4addr' \
+		'netmask:ip4prefix' \
+		'gateway:ip4addr' \
+		'metric:uinteger' \
+		'mtu:uinteger' \
+		'table:range(0,65535)'
+
+	return $?
+}
+
+validate_route6_section()
+{
+	uci_validate_section network route6 "${1}" \
+		'interface:string' \
+		'target:ip6addr' \
+		'gateway:ip6addr' \
+		'metric:uinteger' \
+		'mtu:uinteger' \
+		'table:range(0,65535)'
+
+	return $?
+}
+
+validate_rule_section()
+{
+	uci_validate_section network rule "${1}" \
+		'in:string' \
+		'out:string' \
+		'src:ip4prefix' \
+		'dest:ip4prefix' \
+		'tos:rage(0.31)' \
+		'string:mark' \
+		'invert:bool' \
+		'lookup:range(0,65535)' \
+		'goto:range(0,65535)' \
+		'action:or("prohibit", "unreachable", "blackhole", "throw")'
+
+	return $?
+}
+
+validate_rule6_section()
+{
+	uci_validate_section network rule6 "${1}" \
+		'in:string' \
+		'out:string' \
+		'src:ip4prefix' \
+		'dest:ip4prefix' \
+		'tos:rage(0.31)' \
+		'string:mark' \
+		'invert:bool' \
+		'lookup:range(0,65535)' \ 
+		'goto:range(0,65535)' \
+		'action:or("prohibit", "unreachable", "blackhole", "throw")'
+
+	return $?
+}
+
+validate_switch_section()
+{
+	uci_validate_section network switch "${1}" \
+		'name:string' \
+		'enable:bool' \
+		'enable_vlan:bool' \
+		'reset:bool'
+
+	return $?
+}
+
+validate_switch_vlan()
+{
+	uci_validate_section network switch_vlan "${1}" \
+		'device:string' \
+		'vlan:uinteger' \
+		'ports:list(ports)'
+
+	return $?
+}
+
 service_triggers()
 {
 	procd_open_trigger
 	procd_add_config_trigger "config.change" "network" /etc/init.d/network reload
 	procd_add_config_trigger "config.change" "wireless" /etc/init.d/network reload
 	procd_close_trigger
+
+	procd_open_validate
+	validate_atm_bridge_section
+	validate_route_section
+	validate_route6_section
+	validate_rule_section
+	validate_rule6_section
+	validate_switch_section
+	validate_switch_vlan
+	procd_close_validate
 }
 
 restart() {
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 0117b27ff8..80668ee4fd 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -5,15 +5,15 @@
 init_proto "$@"
 
 proto_dhcp_init_config() {
-	proto_config_add_string "ipaddr"
-	proto_config_add_string "netmask"
-	proto_config_add_string "hostname"
-	proto_config_add_string "clientid"
-	proto_config_add_string "vendorid"
-	proto_config_add_boolean "broadcast"
-	proto_config_add_string "reqopts"
-	proto_config_add_string "iface6rd"
-	proto_config_add_string "sendopts"
+	proto_config_add_string 'ipaddr:ipaddr'
+	proto_config_add_string 'netmask:ipaddr'
+	proto_config_add_string 'hostname:hostname'
+	proto_config_add_string clientid
+	proto_config_add_string vendorid
+	proto_config_add_boolean 'broadcast:ipaddr'
+	proto_config_add_string 'reqopts:list(string)'
+	proto_config_add_string iface6rd
+	proto_config_add_string sendopts
 }
 
 proto_dhcp_setup() {