From: John Crispin <john@openwrt.org>
Date: Fri, 15 Aug 2008 20:18:13 +0000 (+0000)
Subject: trigger error if dport is used when no proto is defined
X-Git-Tag: reboot~25783
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7681547293dda1e0d93c203353b3eaab860dfa63;p=openwrt%2Fstaging%2Fchunkeey.git

trigger error if dport is used when no proto is defined

SVN-Revision: 12317
---

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} \