aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-03-18 23:34:06 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-03-18 23:34:06 +0000
commitbaa56db3f2323e706b089f5d2e1e27c2764d6118 (patch)
treea427c5d8ce89fbce02691bca2532c85b4a1efdb5
parent29ab3f288beab0dd8b4fc596dd906f4a856d5378 (diff)
downloadmaster-187ad058-baa56db3f2323e706b089f5d2e1e27c2764d6118.tar.gz
master-187ad058-baa56db3f2323e706b089f5d2e1e27c2764d6118.tar.bz2
master-187ad058-baa56db3f2323e706b089f5d2e1e27c2764d6118.zip
[package] firewall: revert processing order of redirects and rules, ensures that rules can be used to filter before redirects are reached
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31014 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/firewall/Makefile2
-rw-r--r--package/firewall/files/lib/core.sh6
2 files changed, 4 insertions, 4 deletions
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