From a43f5b5038a93c52b5d45bcbcff78adb6410c43c Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 8 Oct 2010 12:11:55 +0000
Subject: [PATCH] firewall: insert SNAT and DNAT rules according to the order
 of the configuration file (#8052)

SVN-Revision: 23318
---
 package/firewall/Makefile                   | 2 +-
 package/firewall/files/lib/core_redirect.sh | 5 ++++-
 package/firewall/files/lib/core_rule.sh     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 389c2dff87..1b6ec88099 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:=19
+PKG_RELEASE:=20
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/core_redirect.sh b/package/firewall/files/lib/core_redirect.sh
index 9654e7177c..87941a2a17 100644
--- a/package/firewall/files/lib/core_redirect.sh
+++ b/package/firewall/files/lib/core_redirect.sh
@@ -88,7 +88,10 @@ fw_load_redirect() {
 
 	[ "$redirect_proto" == "tcpudp" ] && redirect_proto="tcp udp"
 	for redirect_proto in $redirect_proto; do
-		fw add $mode n $natchain $redirect_target ^ { $redirect_src_ip $redirect_dest_ip } { \
+		local pos
+		eval 'pos=$((++FW__REDIR_COUNT_'${mode#G}'_'$natchain'))'
+
+		fw add $mode n $natchain $redirect_target $pos { $redirect_src_ip $redirect_dest_ip } { \
 			$srcaddr $srcdaddr \
 			${redirect_proto:+-p $redirect_proto} \
 			${srcports:+--sport $srcports} \
diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh
index a0de3ba8bb..9443eef8cf 100644
--- a/package/firewall/files/lib/core_rule.sh
+++ b/package/firewall/files/lib/core_rule.sh
@@ -53,7 +53,7 @@ fw_load_rule() {
 	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'_'$chain'))'
+	eval 'rule_pos=$((++FW__RULE_COUNT_'${mode#G}'_'$chain'))'
 
 	[ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
 	for rule_proto in $rule_proto; do