aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-02-21 00:22:23 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-02-21 00:22:23 +0000
commitb22ad85bc659026513651c30d739632573c10c61 (patch)
tree13add9a9f262097f22181ff99d8deb8fb0bc8a2e
parent354efde275c8e9b710504a013b2ebe8af74fa1ca (diff)
downloadupstream-b22ad85bc659026513651c30d739632573c10c61.tar.gz
upstream-b22ad85bc659026513651c30d739632573c10c61.tar.bz2
upstream-b22ad85bc659026513651c30d739632573c10c61.zip
firewall: fix validation constraints
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 39649
-rwxr-xr-xpackage/network/config/firewall/files/firewall.init16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/network/config/firewall/files/firewall.init b/package/network/config/firewall/files/firewall.init
index 8abbf68254..1147b83335 100755
--- 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 $?