kernel: fq_codel: dont reinit flow state

[openwrt/staging/mkresin.git] / package / firewall / files / reflection.hotplug

diff --git a/package/firewall/files/reflection.hotplug b/package/firewall/files/reflection.hotplug
index 33d121cec41e8b6fc8284b6d980e279d53257cb3..843c615bcbb6d17d678a3e96ae93752f6713ad30 100644 (file)
--- a/package/firewall/files/reflection.hotplug
+++ b/package/firewall/files/reflection.hotplug
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-. /etc/functions.sh
+. /lib/functions.sh
+. /lib/functions/network.sh
 
 if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
-       local wanip=$(uci -P/var/state get network.wan.ipaddr)
+       local wanip
+       network_get_ipaddr wanip wan || return
 
        iptables -t nat -F nat_reflection_in 2>/dev/null || {
                iptables -t nat -N nat_reflection_in
@@ -56,27 +58,28 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
                [ "$src" = wan ] && [ "$target" = DNAT ] && {
                        local dest
                        config_get dest "$cfg" dest "lan"
+                       [ "$dest" != "*" ] || return
 
                        local net
                        for net in $(find_networks "$dest"); do
-                               local lanip=$(uci -P/var/state get network.$net.ipaddr)
-                               local lanmk=$(uci -P/var/state get network.$net.netmask)
+                               local lannet
+                               network_get_subnet lannet "$net" || return
 
                                local proto
                                config_get proto "$cfg" proto
 
                                local epmin epmax extport
-                               config_get extport "$cfg" src_dport
+                               config_get extport "$cfg" src_dport "1-65535"
                                [ -n "$extport" ] || return
 
                                epmin="${extport%[-:]*}"; epmax="${extport#*[-:]}"
-                               [ "$epmin" != "$epmax" ] || epmax=""
+                               [ "${epmin#!}" != "$epmax" ] || epmax=""
 
                                local ipmin ipmax intport
                                config_get intport "$cfg" dest_port "$extport"
 
                                ipmin="${intport%[-:]*}"; ipmax="${intport#*[-:]}"
-                               [ "$ipmin" != "$ipmax" ] || ipmax=""
+                               [ "${ipmin#!}" != "$ipmax" ] || ipmax=""
 
                                local exthost
                                config_get exthost "$cfg" src_dip "$wanip"
@@ -85,28 +88,37 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
                                config_get inthost "$cfg" dest_ip
                                [ -n "$inthost" ] || return
 
+                               [ "$proto" = all    ] && proto="tcp udp"
                                [ "$proto" = tcpudp ] && proto="tcp udp"
 
                                [ "${inthost#!}" = "$inthost" ] || return 0
                                [ "${exthost#!}" = "$exthost" ] || return 0
 
+                               [ "${epmin#!}" != "$epmin" ] && \
+                                       extport="! --dport ${epmin#!}${epmax:+:$epmax}" || \
+                                       extport="--dport $epmin${epmax:+:$epmax}"
+
+                               [ "${ipmin#!}" != "$ipmin" ] && \
+                                       intport="! --dport ${ipmin#!}${ipmax:+:$ipmax}" || \
+                                       intport="--dport $ipmin${ipmax:+:$ipmax}"
+
                                local p
                                for p in ${proto:-tcp udp}; do
                                        case "$p" in
-                                               tcp|udp)
+                                               tcp|udp|6|17)
                                                        iptables -t nat -A nat_reflection_in \
-                                                               -s $lanip/$lanmk -d $exthost \
-                                                               -p $p --dport $epmin${epmax:+:$epmax} \
-                                                               -j DNAT --to $inthost:$ipmin${ipmax:+-$ipmax}
+                                                               -s $lannet -d $exthost \
+                                                               -p $p $extport \
+                                                               -j DNAT --to $inthost:${ipmin#!}${ipmax:+-$ipmax}
 
                                                        iptables -t nat -A nat_reflection_out \
-                                                               -s $lanip/$lanmk -d $inthost \
-                                                               -p $p --dport $ipmin${ipmax:+:$ipmax} \
-                                                               -j SNAT --to-source $lanip
+                                                               -s $lannet -d $inthost \
+                                                               -p $p $intport \
+                                                               -j SNAT --to-source ${lannet%%/*}
 
                                                        iptables -t filter -A nat_reflection_fwd \
-                                                               -s $lanip/$lanmk -d $inthost \
-                                                               -p $p --dport $ipmin${ipmax:+:$ipmax} \
+                                                               -s $lannet -d $inthost \
+                                                               -p $p $intport \
                                                                -j ACCEPT
                                                ;;
                                        esac