From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 18 Mar 2012 23:34:06 +0000 (+0000)
Subject: firewall: revert processing order of redirects and rules, ensures that rules can... 
X-Git-Tag: v19.07.0-rc1~25137
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d74c6ce7c5e0f1b4d929ca5e75a85c1e9bcf0015;p=openwrt%2Fstaging%2Fhauke.git

firewall: revert processing order of redirects and rules, ensures that rules can be used to filter before redirects are reached

SVN-Revision: 31014
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 791edca4bb..373baae5f8 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:=48
+PKG_RELEASE:=49
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 0297518a5d..93d4d2e29b 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -30,12 +30,12 @@ fw_start() {
 	echo "Loading forwardings"
 	config_foreach fw_load_forwarding forwarding
 
-	echo "Loading redirects"
-	config_foreach fw_load_redirect redirect
-
 	echo "Loading rules"
 	config_foreach fw_load_rule rule
 
+	echo "Loading redirects"
+	config_foreach fw_load_redirect redirect
+
 	echo "Loading includes"
 	config_foreach fw_load_include include