diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-17 17:20:37 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-17 17:20:37 +0000 |
| commit | 18a79362e9838f83ff3e01871750598d92b095bb (patch) | |
| tree | 02e291eb7aed951c4142422af51fafd3565ed446 /package/firewall | |
| parent | de15765a3768bac4ae99c81ed04460da4760bbf6 (diff) | |
| download | upstream-18a79362e9838f83ff3e01871750598d92b095bb.tar.gz upstream-18a79362e9838f83ff3e01871750598d92b095bb.tar.bz2 upstream-18a79362e9838f83ff3e01871750598d92b095bb.zip | |
firewall: properly clear hooks in fw_stop() to prevent extensions from being called twice after fw_restart()
SVN-Revision: 21488
Diffstat (limited to 'package/firewall')
| -rw-r--r-- | package/firewall/files/lib/core.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh index bf44231fb0..f37b1e6961 100644 --- a/package/firewall/files/lib/core.sh +++ b/package/firewall/files/lib/core.sh @@ -66,6 +66,11 @@ fw_stop() { uci_revert_state firewall config_clear + + local h + for h in $FW_HOOKS; do unset $h; done + + unset FW_HOOKS unset FW_INITIALIZED } @@ -126,8 +131,10 @@ fw_init() { . $file for hk in $hooks; do for pp in pre post; do - type ${lib}_${pp}_${hk}_cb >/dev/null && + type ${lib}_${pp}_${hk}_cb >/dev/null && { append FW_CB_${pp}_${hk} ${lib} + append FW_HOOKS FW_CB_${pp}_${hk} + } done done done |