From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 27 Jan 2011 22:19:53 +0000 (+0000)
Subject: [package] firewall: fix wrong rule order if multiple protocols are used
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/8abaf1c3f45c53b240b4db8fd27350559de6d933

[package] firewall: fix wrong rule order if multiple protocols are used


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

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 1b6ec8809..4a8a5d319 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=20
+PKG_RELEASE:=21
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh
index 9443eef8c..8c234a33a 100644
--- a/package/firewall/files/lib/core_rule.sh
+++ b/package/firewall/files/lib/core_rule.sh
@@ -52,11 +52,11 @@ fw_load_rule() {
 	fw_get_negation src_spec '-s' "${rule_src_ip:+$rule_src_ip/$rule_src_ip_prefixlen}"
 	fw_get_negation dest_spec '-d' "${rule_dest_ip:+$rule_dest_ip/$rule_dest_ip_prefixlen}"
 
-	local rule_pos
-	eval 'rule_pos=$((++FW__RULE_COUNT_'${mode#G}'_'$chain'))'
-
 	[ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
 	for rule_proto in $rule_proto; do
+		local rule_pos
+		eval 'rule_pos=$((++FW__RULE_COUNT_'${mode#G}'_'$chain'))'
+
 		fw add $mode $table $chain $target $rule_pos { $rule_src_ip $rule_dest_ip } { \
 			$src_spec $dest_spec \
 			${rule_proto:+-p $rule_proto} \