Browse Source

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

SVN-Revision: 31014
Jo-Philipp Wich 13 năm trước cách đây
mục cha
commit
d74c6ce7c5
2 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 1 1
      package/firewall/Makefile
  2. 3 3
      package/firewall/files/lib/core.sh

+ 1 - 1
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
 

+ 3 - 3
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