aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/config/firewall3/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-03-13 15:46:30 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-03-13 15:46:30 +0000
commita95bb0d75b78b39df434d3014fe61f9608063aee (patch)
tree8222519526f929fa9c3ef8eaa7b75a1b3f1f479b /package/network/config/firewall3/files
parent0e243585a561f1fa699687f364764254a14ec9ea (diff)
downloadmaster-187ad058-a95bb0d75b78b39df434d3014fe61f9608063aee.tar.gz
master-187ad058-a95bb0d75b78b39df434d3014fe61f9608063aee.tar.bz2
master-187ad058-a95bb0d75b78b39df434d3014fe61f9608063aee.zip
firewall3: update to git head
* Adds support for emitting hotplug events when creating and clearing zones (fixes miniupnpd) * Make NAT reflection direction configurable * Map init script stop action to flush * Map init script reload action to reload * Respect init script disabled state in hotplug handler git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35998 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/config/firewall3/files')
-rw-r--r--package/network/config/firewall3/files/firewall.hotplug2
-rwxr-xr-xpackage/network/config/firewall3/files/firewall.init6
2 files changed, 7 insertions, 1 deletions
diff --git a/package/network/config/firewall3/files/firewall.hotplug b/package/network/config/firewall3/files/firewall.hotplug
index dbb98cdcd2..34f3afec9b 100644
--- a/package/network/config/firewall3/files/firewall.hotplug
+++ b/package/network/config/firewall3/files/firewall.hotplug
@@ -2,6 +2,8 @@
[ "$ACTION" = ifup ] || exit 0
+/etc/init.d/firewall enabled || exit 0
+
fw3 -q network "$INTERFACE" >/dev/null || exit 0
logger -t firewall "Reloading firewall due to ifup of $INTERFACE ($DEVICE)"
diff --git a/package/network/config/firewall3/files/firewall.init b/package/network/config/firewall3/files/firewall.init
index 8c1dbd94ca..64e3a8c12b 100755
--- a/package/network/config/firewall3/files/firewall.init
+++ b/package/network/config/firewall3/files/firewall.init
@@ -13,9 +13,13 @@ start() {
}
stop() {
- fw3 stop
+ fw3 flush
}
restart() {
fw3 restart
}
+
+reload() {
+ fw3 reload
+}