summaryrefslogtreecommitdiffstats
path: root/package/firewall/files/lib/core_init.sh
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-07-15 22:01:48 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-07-15 22:01:48 +0000
commitf8fa598bf461ccdbd0fc6ddb5a61561b9197fed9 (patch)
tree95d659c7a91a27f078c3377ced629ccfb13965ff /package/firewall/files/lib/core_init.sh
parent1ca67cba7f84855f06b41541c21ff6ab8eaf5246 (diff)
downloadmaster-31e0f0ae-f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9.tar.gz
master-31e0f0ae-f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9.tar.bz2
master-31e0f0ae-f8fa598bf461ccdbd0fc6ddb5a61561b9197fed9.zip
firewall: - notrack support was broken in multiple ways, fix it - also consider a zone conntracked if any redirect references it (#7196)
SVN-Revision: 22215
Diffstat (limited to 'package/firewall/files/lib/core_init.sh')
-rw-r--r--package/firewall/files/lib/core_init.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh
index 92d117160f..a55ace17c1 100644
--- a/package/firewall/files/lib/core_init.sh
+++ b/package/firewall/files/lib/core_init.sh
@@ -228,13 +228,12 @@ fw_load_zone() {
}
fw_load_notrack_zone() {
- list_contains FW_CONNTRACK_ZONES "$1" && return
-
fw_config_get_zone "$1"
+ list_contains FW_CONNTRACK_ZONES "${zone_name}" && return
fw_callback pre notrack
- fw add i f zone_${zone_name}_notrack NOTRACK $
+ fw add i r zone_${zone_name}_notrack NOTRACK $
fw_callback post notrack
}