projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ccbbf6a
)
[package] firewall: revert accidential committed changes from r26805
author
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 2 May 2011 12:55:36 +0000
(12:55 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 2 May 2011 12:55:36 +0000
(12:55 +0000)
SVN-Revision: 26806
package/firewall/files/lib/core_interface.sh
patch
|
blob
|
history
diff --git
a/package/firewall/files/lib/core_interface.sh
b/package/firewall/files/lib/core_interface.sh
index 5386292a4827764db6eb387d305b9d520b61112e..bc9eb96ddedc2faa349ccc40d72fa63203229a00 100644
(file)
--- a/
package/firewall/files/lib/core_interface.sh
+++ b/
package/firewall/files/lib/core_interface.sh
@@
-1,55
+1,27
@@
-# Copyright (C) 2009-201
1
OpenWrt.org
+# Copyright (C) 2009-201
0
OpenWrt.org
fw__uci_state_add() {
local var="$1"
local item="$2"
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_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"
}
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
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() {
}
fw_configure_interface() {