aboutsummaryrefslogtreecommitdiffstats
path: root/package/firewall/files/lib
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-17 12:47:14 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-17 12:47:14 +0000
commitfa11019822ae97b23fdc341aaaf0f27583e77c37 (patch)
tree645ededcac1b261fab0a9efa73cda5c03f2ff37e /package/firewall/files/lib
parent5bb4773eb4e04c0b81358ab0ece6b52ee1da6327 (diff)
downloadupstream-fa11019822ae97b23fdc341aaaf0f27583e77c37.tar.gz
upstream-fa11019822ae97b23fdc341aaaf0f27583e77c37.tar.bz2
upstream-fa11019822ae97b23fdc341aaaf0f27583e77c37.zip
[package] firewall:
- defer firewall start until the first interface is brought up by hotplug, fixes race conditions on slow devices - create a file lock during firewall start and wait for it in hotplug events, prevents race conditions between start and addif - start firewall actions in background from hotplug handler since the firewall itself fires further hotplug events which results in a deadlock if not forked off - get loaded state direcly from the uci binary since updated value is not recognized by config_get after uci_set_state - bump package revision to r2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21486 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/files/lib')
-rw-r--r--package/firewall/files/lib/core.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 3fd98d1602..bf44231fb0 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -8,6 +8,8 @@ include /lib/network
fw_start() {
fw_init
+ lock /var/lock/firewall.start
+
FW_DEFAULTS_APPLIED=
fw_is_loaded && {
@@ -49,6 +51,8 @@ fw_start() {
fw_callback post core
uci_set_state firewall core loaded 1
+
+ lock -u /var/lock/firewall.start
}
fw_stop() {
@@ -75,9 +79,8 @@ fw_reload() {
}
fw_is_loaded() {
- local bool
- config_get_bool bool core loaded 0
- return $((! $bool))
+ local bool=$(uci -q -P /var/state get firewall.core.loaded)
+ return $((! ${bool:-0}))
}