[backfire] merge r26961

[openwrt-10.03/.git] / package / firewall / files / reflection.hotplug

diff --git a/package/firewall/files/reflection.hotplug b/package/firewall/files/reflection.hotplug
index dc6780a720053d2da4af69371485915995817b06..33d121cec41e8b6fc8284b6d980e279d53257cb3 100644 (file)
--- a/package/firewall/files/reflection.hotplug
+++ b/package/firewall/files/reflection.hotplug
@@ -15,6 +15,11 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
                iptables -t nat -A postrouting_rule -j nat_reflection_out
        }
 
+       iptables -t filter -F nat_reflection_fwd 2>/dev/null || {
+               iptables -t filter -N nat_reflection_fwd
+               iptables -t filter -A forwarding_rule -j nat_reflection_fwd
+       }
+
        find_networks() {
                find_networks_cb() {
                        local cfg="$1"
@@ -34,14 +39,21 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
 
                config_foreach find_networks_cb zone "$1"
        }
-       
+
        setup_fwd() {
                local cfg="$1"
 
+               local reflection
+               config_get_bool reflection "$cfg" reflection 1
+               [ "$reflection" == 1 ] || return
+
                local src
                config_get src "$cfg" src
 
-               [ "$src" = wan ] && {
+               local target
+               config_get target "$cfg" target DNAT
+
+               [ "$src" = wan ] && [ "$target" = DNAT ] && {
                        local dest
                        config_get dest "$cfg" dest "lan"
 
@@ -75,6 +87,9 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
 
                                [ "$proto" = tcpudp ] && proto="tcp udp"
 
+                               [ "${inthost#!}" = "$inthost" ] || return 0
+                               [ "${exthost#!}" = "$exthost" ] || return 0
+
                                local p
                                for p in ${proto:-tcp udp}; do
                                        case "$p" in
@@ -88,6 +103,11 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
                                                                -s $lanip/$lanmk -d $inthost \
                                                                -p $p --dport $ipmin${ipmax:+:$ipmax} \
                                                                -j SNAT --to-source $lanip
+
+                                                       iptables -t filter -A nat_reflection_fwd \
+                                                               -s $lanip/$lanmk -d $inthost \
+                                                               -p $p --dport $ipmin${ipmax:+:$ipmax} \
+                                                               -j ACCEPT
                                                ;;
                                        esac
                                done
@@ -98,4 +118,3 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
        config_load firewall
        config_foreach setup_fwd redirect
 fi
-