[toolchain]: replace gcc 4.5.2 support with 4.6.1

[openwrt.git] / package / firewall / files / lib / core_interface.sh

diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index f089759..bc9eb96 100644 (file)
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -4,7 +4,11 @@ fw__uci_state_add() {
        local var="$1"
        local item="$2"
 
-       local val="$(uci_get_state firewall core $var)"
+       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 "${val:+$val }$item"
 }
 
@@ -16,6 +20,7 @@ fw__uci_state_del() {
        val="${val// $item / }"
        val="${val# }"
        val="${val% }"
+       uci_revert_state firewall core $var
        uci_set_state firewall core $var "$val"
 }
 
@@ -70,6 +75,9 @@ fw_configure_interface() {
 
                        # Need v4 while zone is v6
                        */*.*) fw_log info "zone $zone does not support IPv4 address family, skipping"; return ;;
+
+                       # Strip prefix
+                       *) mode="${mode#G}" ;;
                esac
 
                lock /var/run/firewall-interface.lock