summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-15 20:18:13 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-15 20:18:13 +0000
commitb4667d52b090ed70c1bd2a50d24e90a0d25bbb84 (patch)
tree47d19a3953db54dfb8654d3f7a2630feacef5e13
parenteb1995908df17900e5e95a6c236ddbbf6c24e6a3 (diff)
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-xpackage/firewall/files/uci_firewall.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index e1683e9cf..27e9dd71d 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} \