ar71xx: fix trailing statements location

[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 69ddc34..f089759 100644 (file)
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -1,5 +1,24 @@
 # Copyright (C) 2009-2010 OpenWrt.org
 
 # Copyright (C) 2009-2010 OpenWrt.org
 

+fw__uci_state_add() {
+       local var="$1"
+       local item="$2"
+
+       local val="$(uci_get_state firewall core $var)"
+       uci_set_state firewall core $var "${val:+$val }$item"
+}
+
+fw__uci_state_del() {
+       local var="$1"
+       local item="$2"
+
+       local val=" $(uci_get_state firewall core $var) "
+       val="${val// $item / }"
+       val="${val# }"
+       val="${val% }"
+       uci_set_state firewall core $var "$val"
+}
+

 fw_configure_interface() {
        local iface=$1
        local action=$2
 fw_configure_interface() {
        local iface=$1
        local action=$2


@@ -12,8 +31,9 @@ fw_configure_interface() {
        }
 
        [ -n "$ifname" ] || {
        }
 
        [ -n "$ifname" ] || {

-               ifname=$(uci_get_state network "$iface" ifname "$iface")
+               ifname=$(uci_get_state network "$iface" ifname)

                ifname="${ifname%%:*}"
                ifname="${ifname%%:*}"

+               [ -z "$ifname" ] && return 0

        }
 
        [ "$ifname" == "lo" ] && return 0
        }
 
        [ "$ifname" == "lo" ] && return 0


@@ -27,8 +47,8 @@ fw_configure_interface() {
                local ifname=$3
                local subnet=$4
 
                local ifname=$3
                local subnet=$4
 

-               local inet onet
-               local mode=$(fw_get_family_mode x $zone i)
+               local inet onet mode
+               fw_get_family_mode mode x $zone i

 
                case "$mode/$subnet" in
                        # Zone supports v6 only or dual, need v6
 
                case "$mode/$subnet" in
                        # Zone supports v6 only or dual, need v6


@@ -52,6 +72,8 @@ fw_configure_interface() {
                        */*.*) fw_log info "zone $zone does not support IPv4 address family, skipping"; return ;;
                esac
 
                        */*.*) fw_log info "zone $zone does not support IPv4 address family, skipping"; return ;;
                esac
 

+               lock /var/run/firewall-interface.lock
+

                fw $action $mode f ${chain}_ACCEPT ACCEPT $ { -o "$ifname" $onet }
                fw $action $mode f ${chain}_ACCEPT ACCEPT $ { -i "$ifname" $inet }
                fw $action $mode f ${chain}_DROP   DROP   $ { -o "$ifname" $onet }
                fw $action $mode f ${chain}_ACCEPT ACCEPT $ { -o "$ifname" $onet }
                fw $action $mode f ${chain}_ACCEPT ACCEPT $ { -i "$ifname" $inet }
                fw $action $mode f ${chain}_DROP   DROP   $ { -o "$ifname" $onet }


@@ -59,13 +81,15 @@ fw_configure_interface() {
                fw $action $mode f ${chain}_REJECT reject $ { -o "$ifname" $onet }
                fw $action $mode f ${chain}_REJECT reject $ { -i "$ifname" $inet }
 
                fw $action $mode f ${chain}_REJECT reject $ { -o "$ifname" $onet }
                fw $action $mode f ${chain}_REJECT reject $ { -i "$ifname" $inet }
 

-               fw $action $mode n ${chain}_nat MASQUERADE $ { -o "$ifname" $onet }

                fw $action $mode f ${chain}_MSSFIX TCPMSS  $ { -o "$ifname" -p tcp --tcp-flags SYN,RST SYN --clamp-mss-to-pmtu $onet }
 
                fw $action $mode f input   ${chain}         $ { -i "$ifname" $inet }
                fw $action $mode f forward ${chain}_forward $ { -i "$ifname" $inet }
                fw $action $mode n PREROUTING ${chain}_prerouting $ { -i "$ifname" $inet }
                fw $action $mode r PREROUTING ${chain}_notrack    $ { -i "$ifname" $inet }
                fw $action $mode f ${chain}_MSSFIX TCPMSS  $ { -o "$ifname" -p tcp --tcp-flags SYN,RST SYN --clamp-mss-to-pmtu $onet }
 
                fw $action $mode f input   ${chain}         $ { -i "$ifname" $inet }
                fw $action $mode f forward ${chain}_forward $ { -i "$ifname" $inet }
                fw $action $mode n PREROUTING ${chain}_prerouting $ { -i "$ifname" $inet }
                fw $action $mode r PREROUTING ${chain}_notrack    $ { -i "$ifname" $inet }

+               fw $action $mode n POSTROUTING ${chain}_nat       $ { -o "$ifname" $onet }
+
+               lock -u /var/run/firewall-interface.lock

        }
 
        local old_zones old_ifname old_subnets
        }
 
        local old_zones old_ifname old_subnets


@@ -82,7 +106,10 @@ fw_configure_interface() {
                                fw__do_rules del $z $old_ifname $n
                        done
 
                                fw__do_rules del $z $old_ifname $n
                        done
 

-                       [ -n "$old_subnets" ] || ACTION=remove ZONE="$z" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall
+                       [ -n "$old_subnets" ] || {
+                               fw__uci_state_del "${z}_networks" "$iface"
+                               env -i ACTION=remove ZONE="$z" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall
+                       }

                done
 
                local old_aliases
                done
 
                local old_aliases


@@ -135,10 +162,13 @@ fw_configure_interface() {
                list_contains zone_network "$iface" || return
 
                fw_log info "adding $iface ($ifname${aliasnet:+ alias $aliasnet}) to zone $zone_name"
                list_contains zone_network "$iface" || return
 
                fw_log info "adding $iface ($ifname${aliasnet:+ alias $aliasnet}) to zone $zone_name"

-               fw__do_rules add ${zone_name} "$ifname" $aliasnet
+               fw__do_rules add ${zone_name} "$ifname" "$aliasnet"

                append new_zones $zone_name
 
                append new_zones $zone_name
 

-               [ -n "$aliasnet" ] || ACTION=add ZONE="$zone_name" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall
+               [ -n "$aliasnet" ] || {
+                       fw__uci_state_add "${zone_name}_networks" "${zone_network}"
+                       env -i ACTION=add ZONE="$zone_name" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall
+               }

        }
        config_foreach load_zone zone
 
        }
        config_foreach load_zone zone