diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-15 22:01:48 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-15 22:01:48 +0000 |
commit | df7742c8aad85c15da77f3586af30d16df1392ad (patch) | |
tree | 86f2d642266a64eb2e00a6019bbad95cf413dd0c /package/firewall/files/lib/core_init.sh | |
parent | 956de1c1205bb3f70eb9a29af78c5f1a208c1a3b (diff) | |
download | master-187ad058-df7742c8aad85c15da77f3586af30d16df1392ad.tar.gz master-187ad058-df7742c8aad85c15da77f3586af30d16df1392ad.tar.bz2 master-187ad058-df7742c8aad85c15da77f3586af30d16df1392ad.zip |
[package] firewall:
- notrack support was broken in multiple ways, fix it
- also consider a zone conntracked if any redirect references it (#7196)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22215 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/files/lib/core_init.sh')
-rw-r--r-- | package/firewall/files/lib/core_init.sh | 5 |
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 } |