firewall: - handle NAT reflection in firewall hotplug, solves synchronizing issues...

SVN-Revision: 22888

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 1c9c612f8a09ba4807bd7f1da8b4648cadb661e2..40c82837fc62f90079533c6dbc0bfa4857e8d0d8 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -45,7 +45,8 @@ define Package/firewall/install
        $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_DATA) ./files/firewall.hotplug $(1)/etc/hotplug.d/iface/20-firewall
-       $(INSTALL_DATA) ./files/reflection.hotplug $(1)/etc/hotplug.d/iface/30-nat-reflection
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/firewall
+       $(INSTALL_DATA) ./files/reflection.hotplug $(1)/etc/hotplug.d/firewall/10-nat-reflection
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/firewall.user $(1)/etc
 endef

diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh
index 72cef2f8cc98bdb8d4b38e49f0f040622f59bffb..bce94afe0258f5d8fd96e8952004290e7567734d 100644 (file)
--- a/package/firewall/files/lib/core_init.sh
+++ b/package/firewall/files/lib/core_init.sh
@@ -142,6 +142,8 @@ fw_config_get_zone() {
                string output "$FW_DEFAULT_OUTPUT_POLICY" \
                string forward "$FW_DEFAULT_FORWARD_POLICY" \
                boolean masq 0 \
+               string masq_src "" \
+               string masq_dest "" \
                boolean conntrack 0 \
                boolean mtu_fix 0 \
                boolean custom_chains "$FW_ADD_CUSTOM_CHAINS" \

diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index 69ddc343aa74bf887a5bcf1ae0cdd4fe223e5511..c2a5bd7f33a9cd07d9bc3ac18f87bcc591d095f7 100644 (file)
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -12,8 +12,9 @@ fw_configure_interface() {
        }
 
        [ -n "$ifname" ] || {
-               ifname=$(uci_get_state network "$iface" ifname "$iface")
+               ifname=$(uci_get_state network "$iface" ifname)
                ifname="${ifname%%:*}"
+               [ -z "$ifname" ] && return 0
        }
 
        [ "$ifname" == "lo" ] && return 0
@@ -26,6 +27,8 @@ fw_configure_interface() {
                local chain=zone_${zone}
                local ifname=$3
                local subnet=$4
+               local masq_src=$5
+               local masq_dest=$6
 
                local inet onet
                local mode=$(fw_get_family_mode x $zone i)
@@ -59,7 +62,16 @@ 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 n ${chain}_nat MASQUERADE $ { -o "$ifname" $onet }
+               # NB: if MASQUERADING for IPv6 becomes available we'll need a family check here
+               local msrc mdst
+               for msrc in ${masq_src:-0.0.0.0/0}; do
+                       [ "${msrc#!}" != "$msrc" ] && msrc="! -s ${msrc#!}" || msrc="-s $msrc"
+                       for mdst in ${subnet:-${masq_dest:-0.0.0.0/0}}; do
+                               [ "${mdst#!}" != "$mdst" ] && mdst="! -d ${mdst#!}" || mdst="-d $mdst"
+                               fw $action $mode n ${chain}_nat MASQUERADE $ { -o "$ifname" $msrc $mdst }
+                       done
+               done
+
                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 }
@@ -68,18 +80,20 @@ fw_configure_interface() {
                fw $action $mode r PREROUTING ${chain}_notrack    $ { -i "$ifname" $inet }
        }
 
-       local old_zones old_ifname old_subnets
+       local old_zones old_ifname old_subnets old_masq_src old_masq_dest
        config_get old_zones core "${iface}_zone"
        [ -n "$old_zones" ] && {
                config_get old_ifname core "${iface}_ifname"
                config_get old_subnets core "${iface}_subnets"
+               config_get old_masq_src core "${iface}_masq_src"
+               config_get old_masq_dest core "${iface}_masq_dest"
 
                local z
                for z in $old_zones; do
                        local n
                        for n in ${old_subnets:-""}; do
                                fw_log info "removing $iface ($old_ifname${n:+ alias $n}) from zone $z"
-                               fw__do_rules del $z $old_ifname $n
+                               fw__do_rules del $z $old_ifname $n "$old_masq_src" "$old_masq_dest"
                        done
 
                        [ -n "$old_subnets" ] || ACTION=remove ZONE="$z" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall
@@ -97,6 +111,8 @@ fw_configure_interface() {
                uci_revert_state firewall core "${iface}_ifname"
                uci_revert_state firewall core "${iface}_subnets"
                uci_revert_state firewall core "${iface}_aliases"
+               uci_revert_state firewall core "${iface}_masq_src"
+               uci_revert_state firewall core "${iface}_masq_dest"
        }
 
        [ "$action" == del ] && return
@@ -130,13 +146,17 @@ fw_configure_interface() {
        }
 
        local new_zones=
+       local new_masq_src=
+       local new_masq_dest=
        load_zone() {
                fw_config_get_zone "$1"
                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" "$zone_masq_src" "$zone_masq_dest"
                append new_zones $zone_name
+               append new_masq_src "$zone_masq_src"
+               append new_masq_dest "$zone_masq_dest"
 
                [ -n "$aliasnet" ] || ACTION=add ZONE="$zone_name" INTERFACE="$iface" DEVICE="$ifname" /sbin/hotplug-call firewall
        }
@@ -144,6 +164,8 @@ fw_configure_interface() {
 
        uci_set_state firewall core "${iface}_zone" "$new_zones"
        uci_set_state firewall core "${iface}_ifname" "$ifname"
+       uci_set_state firewall core "${iface}_masq_src" "$new_masq_src"
+       uci_set_state firewall core "${iface}_masq_dest" "$new_masq_dest"
 }
 
 fw_sysctl_interface() {

diff --git a/package/firewall/files/reflection.hotplug b/package/firewall/files/reflection.hotplug
index af88fe0243fdb2e550b3837d87d7d85323b9da1c..dc6780a720053d2da4af69371485915995817b06 100644 (file)
--- a/package/firewall/files/reflection.hotplug
+++ b/package/firewall/files/reflection.hotplug
@@ -2,7 +2,7 @@
 
 . /etc/functions.sh
 
-if [ "$ACTION" = "ifup" ] && [ "$INTERFACE" = "wan" ]; then
+if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
        local wanip=$(uci -P/var/state get network.wan.ipaddr)
 
        iptables -t nat -F nat_reflection_in 2>/dev/null || {