EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 21486
This commit is contained in:
Jo-Philipp Wich 2010-05-17 12:47:14 +00:00
parent c8f606c760
commit de15765a37
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/firewall/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall PKG_NAME:=firewall
PKG_VERSION:=2 PKG_VERSION:=2
PKG_RELEASE:=1 PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

15
package/firewall/files/firewall.hotplug
View File

@ -9,11 +9,20 @@
. /lib/firewall/core.sh . /lib/firewall/core.sh
fw_init fw_init
fw_is_loaded || exit 0
# Wait for firewall if startup is in progress
lock -w /var/lock/firewall.start
case "$ACTION" in case "$ACTION" in
ifup) ifup)
fw_configure_interface "$INTERFACE" add "$DEVICE" ;; fw_is_loaded && {
fw_configure_interface "$INTERFACE" add "$DEVICE" &
} || {
/etc/init.d/firewall enabled && fw_start &
}
;;
ifdown) ifdown)
fw_configure_interface "$INTERFACE" del "$DEVICE" ;; fw_is_loaded && fw_configure_interface "$INTERFACE" del "$DEVICE" &
;;
esac esac

2
package/firewall/files/firewall.init
View File

@ -10,6 +10,8 @@ fw() {
fw_$1 fw_$1
} }
boot() { :; }
start() { start() {
fw start fw start
} }

9
package/firewall/files/lib/core.sh
View File

@ -8,6 +8,8 @@ include /lib/network
fw_start() { fw_start() {
fw_init fw_init
lock /var/lock/firewall.start
FW_DEFAULTS_APPLIED= FW_DEFAULTS_APPLIED=
fw_is_loaded && { fw_is_loaded && {
@ -49,6 +51,8 @@ fw_start() {
fw_callback post core fw_callback post core
uci_set_state firewall core loaded 1 uci_set_state firewall core loaded 1
lock -u /var/lock/firewall.start
} }
fw_stop() { fw_stop() {
@ -75,9 +79,8 @@ fw_reload() {
} }
fw_is_loaded() { fw_is_loaded() {
local bool local bool=$(uci -q -P /var/state get firewall.core.loaded)
config_get_bool bool core loaded 0 return $((! ${bool:-0}))
return $((! $bool))
} }