diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-19 00:50:14 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-19 00:50:14 +0000 |
| commit | c6fdffd9324698cf6147fc3c7dce1cb0526c4d16 (patch) | |
| tree | 6bf79200f62e3d4c9e4f4f16b9df53ead7051b1d /package/firewall/files/firewall.hotplug | |
| parent | 91519d51e9e2198d9afc5f1563084a307a5e7d4d (diff) | |
| download | master-31e0f0ae-c6fdffd9324698cf6147fc3c7dce1cb0526c4d16.tar.gz master-31e0f0ae-c6fdffd9324698cf6147fc3c7dce1cb0526c4d16.tar.bz2 master-31e0f0ae-c6fdffd9324698cf6147fc3c7dce1cb0526c4d16.zip | |
firewall (#7355) - partially revert r21486, start firewall on init again - skip iface hotplug events if base fw is not up yet - get ifname and up state with uci_get_state() in iface setup since the values gathered by scan_interfaces() may be outdated when iface coldplugging happens (observed with pptp) - ignore up state when bringing down interfaces because ifdown reverts state vars before dispatching the iface event - bump package revision
SVN-Revision: 21502
Diffstat (limited to 'package/firewall/files/firewall.hotplug')
| -rw-r--r-- | package/firewall/files/firewall.hotplug | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/package/firewall/files/firewall.hotplug b/package/firewall/files/firewall.hotplug index bc75e42d1d..ac8469524b 100644 --- a/package/firewall/files/firewall.hotplug +++ b/package/firewall/files/firewall.hotplug @@ -3,26 +3,20 @@ # HOTPLUG_TYPE=iface, triggered by various scripts when an interface # is configured (ACTION=ifup) or deconfigured (ACTION=ifdown). The # interface is available as INTERFACE, the real device as DEVICE. -. /etc/functions.sh [ "$DEVICE" == "lo" ] && exit 0 +. /etc/functions.sh . /lib/firewall/core.sh -fw_init -# Wait for firewall if startup is in progress -lock -w /var/lock/firewall.start +fw_init +fw_is_loaded || exit 0 case "$ACTION" in ifup) - fw_is_loaded && { - fw_configure_interface "$INTERFACE" add "$DEVICE" & - } || { - /etc/init.d/firewall enabled && fw_start & - } + fw_configure_interface "$INTERFACE" add "$DEVICE" & ;; ifdown) - fw_is_loaded && fw_configure_interface "$INTERFACE" del "$DEVICE" & + fw_configure_interface "$INTERFACE" del "$DEVICE" & ;; esac - |