From bb699867e032c4a6e681f9bde4325b88914392c5 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 23 Oct 2013 10:25:26 +0000 Subject: [PATCH] firewall: Improve ubus support * Use network.interface dump call instead of individual status calls to reduce overall netifd lookups and invokes to 1 per fw3 process. * Allow protocol handlers to assign a firewall zone for an interface in the data section to allow for dynamic firewall zone assignment. SVN-Revision: 38504 --- package/network/config/firewall/Makefile | 4 ++-- package/network/config/firewall/files/firewall.hotplug | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 0d495117d4be..ac4d16a388a6 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall -PKG_VERSION:=2013-10-10 +PKG_VERSION:=2013-10-23 PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/firewall3.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=fca5e39564e488b169c8c535dcf658649f81429e +PKG_SOURCE_VERSION:=c25922c05ae594c4c35fa65f27fd21c3a033f4ec PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jo-Philipp Wich diff --git a/package/network/config/firewall/files/firewall.hotplug b/package/network/config/firewall/files/firewall.hotplug index 34f3afec9b54..20a95d4363d2 100644 --- a/package/network/config/firewall/files/firewall.hotplug +++ b/package/network/config/firewall/files/firewall.hotplug @@ -1,6 +1,6 @@ #!/bin/sh -[ "$ACTION" = ifup ] || exit 0 +[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0 /etc/init.d/firewall enabled || exit 0 -- 2.30.2