KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewall: revert accidential committed changes from r26805

Browse source 
SVN-Revision: 26806
This commit is contained in:
Jo-Philipp Wich 2011-05-02 12:55:36 +00:00
parent ad23dd94b6
commit 2e9e4c435f
1 changed files with 11 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
package/firewall/files/lib/core_interface.sh
View file

@ -1,55 +1,27 @@
# Copyright (C) 2009-2011 OpenWrt.org # Copyright (C) 2009-2010 OpenWrt.org
fw__uci_state_add() { fw__uci_state_add() {
local var="$1" local var="$1"
local item="$2" local item="$2"
local list="$(uci_get_state firewall core $var)" local val=" $(uci_get_state firewall core $var) "
list=" ${list:+$list }" val="${val// $item / }"
val="${val# }"
for item in $item; do val="${val% }"
case "$list" in
"* $item *") continue;;
*) list="$list$item ";;
esac
done
list="${list% }"
list="${list# }"
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() { fw__uci_state_del() {
local var="$1" local var="$1"
local item="$2" local item="$2"
echo "del[$item]" local val=" $(uci_get_state firewall core $var) "
val="${val// $item / }"
local list val val="${val# }"
for val in $(uci_get_state firewall core "$var" | sort -u); do val="${val% }"
list="${list:+$list }$val"
done
echo "list[$list]"
uci_revert_state firewall core $var uci_revert_state firewall core $var
uci_set_state firewall core $var "$val"
[ -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"
}
} }
fw_configure_interface() { fw_configure_interface() {