firewall: fix validation constraints

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

diff --git a/package/network/config/firewall/files/firewall.init b/package/network/config/firewall/files/firewall.init
index 8abbf68254933b47f03e8eb6f881f9353c5dd659..1147b833357208cf2f3597c30f59ee4bc668237c 100755 (executable)
--- a/package/network/config/firewall/files/firewall.init
+++ b/package/network/config/firewall/files/firewall.init
@@ -7,13 +7,13 @@ QUIET=""
 validate_firewall_redirect()
 {
        uci_validate_section firewall redirect "${1}" \
-               'proto:or("tcp", "udp", "tcpudp")' \
+               'proto:or(uinteger, string)' \
                'src:string' \
-               'src_ip:ipaddr' \
-               'src_dport:string' \
+               'src_ip:cidr' \
+               'src_dport:or(port, portrange)' \
                'dest:string' \
-               'dest_ip:ipaddr' \
-               'dest_port:string' \
+               'dest_ip:cidr' \
+               'dest_port:or(port, portrange)' \
                'target:or("SNAT", "DNAT")'
        
        return $?
@@ -22,11 +22,11 @@ validate_firewall_redirect()
 validate_firewall_rule()
 {
        uci_validate_section firewall rule "${1}" \
-               'proto:string' \
+               'proto:or(uinteger, string)' \
                'src:string' \
                'dest:string' \
-               'src_port:string' \
-               'dest_port:string' \
+               'src_port:or(port, portrange)' \
+               'dest_port:or(port, portrange)' \
                'target:string'
        
        return $?