From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 28 Sep 2010 11:38:31 +0000 (+0000)
Subject: [package] firewall: fix chain selection logic, option dest must be ignored for notrac... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/43c3b75619cec98a71fd3bdc252990294853d4c1?ds=sidebyside

[package] firewall: fix chain selection logic, option dest must be ignored for notrack targets


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23143 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh
index dbaf1102e..a0de3ba8b 100644
--- a/package/firewall/files/lib/core_rule.sh
+++ b/package/firewall/files/lib/core_rule.sh
@@ -36,16 +36,15 @@ fw_load_rule() {
 
 	local table=f
 	local chain=input
-	if [ "$rule_target" == "NOTRACK" ]; then
+	local target="${rule_target:-REJECT}"
+	if [ "$target" == "NOTRACK" ]; then
 		table=r
 		chain="zone_${rule_src}_notrack"
-	elif [ -n "$rule_src" ]; then
-		chain="zone_${rule_src}${rule_dest:+_forward}"
+	else
+		[ -n "$rule_src" ] && chain="zone_${rule_src}${rule_dest:+_forward}"
+		[ -n "$rule_dest" ] && target="zone_${rule_dest}_${target}"
 	fi
 
-	local target="${rule_target:-REJECT}"
-	[ -n "$dest" ] && target="zone_${rule_dest}_${target}"
-
 	local mode
 	fw_get_family_mode mode ${rule_family:-x} $rule_src I