From: John Crispin <john@openwrt.org>
Date: Sun, 28 Sep 2008 17:40:09 +0000 (+0000)
Subject: fixes firewall rule generation. forwarding rules were inserted in input chains, fixes... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=221f4ad32d94481baf53885553a4fb3feda22965;p=openwrt%2Fstaging%2Frobimarko.git

fixes firewall rule generation. forwarding rules were inserted in input chains, fixes #4028

SVN-Revision: 12768
---

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index 5798b7fc48..0f7e2ff058 100755
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -216,10 +216,13 @@ fw_rule() {
 	config_get proto $1 proto
 	config_get target $1 target
 	config_get ruleset $1 ruleset
-
+	
+	ZONE=input
+	TARGET=$target
 	[ -z "$target" ] && target=DROP
-	[ -n "$src" ] && ZONE=zone_$src || ZONE=input
-	[ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target
+	[ -n "$src" -a -z "$dest" ] && ZONE=zone_$src
+	[ -n "$src" -a -n "$dest" ] && ZONE=zone_${src}_forward
+	[ -n "$dest" ] && TARGET=zone_${dest}_$target
 	add_rule() {
 		$IPTABLES -I $ZONE 1 \
 			${proto:+-p $proto} \