From 5cc94f2ac693c6e4ba118aef880a66d813ad6390 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 2 May 2011 12:55:36 +0000
Subject: [package] firewall: revert accidential committed changes from r26805

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26806 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/firewall/files/lib/core_interface.sh | 50 ++++++----------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

(limited to 'package/firewall')

diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index 5386292a48..bc9eb96dde 100644
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -1,55 +1,27 @@
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 
 fw__uci_state_add() {
 	local var="$1"
 	local item="$2"
 
-	local list="$(uci_get_state firewall core $var)"
-	      list=" ${list:+$list }"
-
-	for item in $item; do
-		case "$list" in
-			"* $item *") continue;;
-			*) list="$list$item ";;
-		esac
-	done
-
-	list="${list% }"
-	list="${list# }"
-
+	local val=" $(uci_get_state firewall core $var) "
+	val="${val// $item / }"
+	val="${val# }"
+	val="${val% }"
 	uci_revert_state firewall core $var
-	uci_set_state firewall core $var "$list"
+	uci_set_state firewall core $var "${val:+$val }$item"
 }
 
 fw__uci_state_del() {
 	local var="$1"
 	local item="$2"
 
-	echo "del[$item]"
-
-	local list val
-	for val in $(uci_get_state firewall core "$var" | sort -u); do
-		list="${list:+$list }$val"
-	done
-
-	echo "list[$list]"
-
+	local val=" $(uci_get_state firewall core $var) "
+	val="${val// $item / }"
+	val="${val# }"
+	val="${val% }"
 	uci_revert_state firewall core $var
-
-	[ -n "$list" ] && {
-		list=" $list "
-
-		for item in $item; do
-			list="${list// $item / }"
-		done
-
-		list="${list# }"
-		list="${list% }"
-
-		echo "list2[$list]"
-
-		uci_set_state firewall core $var "$list"
-	}
+	uci_set_state firewall core $var "$val"
 }
 
 fw_configure_interface() {
-- 
cgit v1.2.3