diff options
| author | John Crispin <blogic@openwrt.org> | 2008-08-15 20:18:13 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2008-08-15 20:18:13 +0000 |
| commit | 4a9e00347189546b81e405b9cdcc096e6832e471 (patch) | |
| tree | 47d19a3953db54dfb8654d3f7a2630feacef5e13 | |
| parent | 980cf1cd93efc6d6f5e317f944f10e6d3e772e72 (diff) | |
| download | upstream-4a9e00347189546b81e405b9cdcc096e6832e471.tar.gz upstream-4a9e00347189546b81e405b9cdcc096e6832e471.tar.bz2 upstream-4a9e00347189546b81e405b9cdcc096e6832e471.zip | |
trigger error if dport is used when no proto is defined
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12317 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/firewall/files/uci_firewall.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh index e1683e9cf0..27e9dd71d6 100755 --- a/package/firewall/files/uci_firewall.sh +++ b/package/firewall/files/uci_firewall.sh @@ -178,6 +178,8 @@ fw_rule() { [ -z "$target" ] && target=DROP [ -n "$src" ] && ZONE=zone_$src || ZONE=INPUT [ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target + [ -n "$dest_port" -a -z "$proto" ] && { \ + echo "dport may only be used it proto is defined"; return; } $IPTABLES -I $ZONE 1 \ ${proto:+-p $proto} \ ${src_ip:+-s $src_ip} \ @@ -220,6 +222,8 @@ fw_redirect() { config_get protocol $1 protocol [ -z "$src" -o -z "$dest_ip" ] && { \ echo "redirect needs src and dest_ip"; return ; } + [ -n "$dest_port" -a -z "$proto" ] && { \ + echo "dport may only be used it proto is defined"; return; } $IPTABLES -A zone_${src}_prerouting -t nat \ ${protocol:+-p $protocol} \ ${src_ip:+-s $srcdip} \ |