[package] firewall: prevent excessive uci state data aggregation (#9152)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26740 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index ea407f0..829719c 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
 PKG_NAME:=firewall
 
 PKG_VERSION:=2

-PKG_RELEASE:=24
+PKG_RELEASE:=25

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index ed6a4b1..bc9eb96 100644 (file)
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -8,6 +8,7 @@ fw__uci_state_add() {
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"

+       uci_revert_state firewall core $var

        uci_set_state firewall core $var "${val:+$val }$item"
 }
 
        uci_set_state firewall core $var "${val:+$val }$item"
 }
 


@@ -19,6 +20,7 @@ fw__uci_state_del() {
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"

+       uci_revert_state firewall core $var

        uci_set_state firewall core $var "$val"
 }
 
        uci_set_state firewall core $var "$val"
 }