[backfire] firewall: sync with trunk

[openwrt-10.03/.git] / package / firewall / files / lib / core_redirect.sh

diff --git a/package/firewall/files/lib/core_redirect.sh b/package/firewall/files/lib/core_redirect.sh
index 87941a2a174d3425a5acb49eb076657ce90da6d5..a3e70d40d74fd6b051c51a9375f600240dbf75a8 100644 (file)
--- a/package/firewall/files/lib/core_redirect.sh
+++ b/package/firewall/files/lib/core_redirect.sh
@@ -13,11 +13,11 @@ fw_config_get_redirect() {
                string src_dport "" \
                string dest "" \
                ipaddr dest_ip "" \
-               string dest_mac "" \
                string dest_port "" \
                string proto "tcpudp" \
                string family "" \
                string target "DNAT" \
+               string extra "" \
        } || return
        [ -n "$redirect_name" ] || redirect_name=$redirect__name
 }
@@ -29,26 +29,27 @@ fw_load_redirect() {
 
        local fwdchain natchain natopt nataddr natports srcdaddr srcdports
        if [ "$redirect_target" == "DNAT" ]; then
-               [ -n "$redirect_src" -a -n "$redirect_dest_ip$redirect_dest_port" ] || {
+               [ -n "${redirect_src#*}" -a -n "$redirect_dest_ip$redirect_dest_port" ] || {
                        fw_log error "DNAT redirect ${redirect_name}: needs src and dest_ip or dest_port, skipping"
                        return 0
                }
 
-               fwdchain="zone_${redirect_src}_forward"
+               fwdchain="zone_${redirect_src}${redirect_dest_ip:+_forward}"
 
                natopt="--to-destination"
                natchain="zone_${redirect_src}_prerouting"
                nataddr="$redirect_dest_ip"
-               fw_get_port_range natports "$redirect_dest_port" "-"
+               fw_get_port_range natports "${redirect_dest_port#!}" "-"
 
                fw_get_negation srcdaddr '-d' "${redirect_src_dip:+$redirect_src_dip/$redirect_src_dip_prefixlen}"
                fw_get_port_range srcdports "$redirect_src_dport" ":"
+               fw_get_negation srcdports '--dport' "$srcdports"
 
                list_contains FW_CONNTRACK_ZONES $redirect_src || \
                        append FW_CONNTRACK_ZONES $redirect_src
 
        elif [ "$redirect_target" == "SNAT" ]; then
-               [ -n "$redirect_dest" -a -n "$redirect_src_dip" ] || {
+               [ -n "${redirect_dest#*}" -a -n "$redirect_src_dip" ] || {
                        fw_log error "SNAT redirect ${redirect_name}: needs dest and src_dip, skipping"
                        return 0
                }
@@ -58,10 +59,11 @@ fw_load_redirect() {
                natopt="--to-source"
                natchain="zone_${redirect_dest}_nat"
                nataddr="$redirect_src_dip"
-               fw_get_port_range natports "$redirect_src_dport" "-"
+               fw_get_port_range natports "${redirect_src_dport#!}" "-"
 
                fw_get_negation srcdaddr '-d' "${redirect_dest_ip:+$redirect_dest_ip/$redirect_dest_ip_prefixlen}"
                fw_get_port_range srcdports "$redirect_dest_port" ":"
+               fw_get_negation srcdports '--dport' "$srcdports"
 
                list_contains FW_CONNTRACK_ZONES $redirect_dest || \
                        append FW_CONNTRACK_ZONES $redirect_dest
@@ -79,35 +81,38 @@ fw_load_redirect() {
 
        local srcports
        fw_get_port_range srcports "$redirect_src_port" ":"
+       fw_get_negation srcports '--sport' "$srcports"
 
        local destaddr
        fw_get_negation destaddr '-d' "${redirect_dest_ip:+$redirect_dest_ip/$redirect_dest_ip_prefixlen}"
 
        local destports
        fw_get_port_range destports "${redirect_dest_port:-$redirect_src_dport}" ":"
+       fw_get_negation destports '--dport' "$destports"
 
        [ "$redirect_proto" == "tcpudp" ] && redirect_proto="tcp udp"
-       for redirect_proto in $redirect_proto; do
-               local pos
-               eval 'pos=$((++FW__REDIR_COUNT_'${mode#G}'_'$natchain'))'
-
-               fw add $mode n $natchain $redirect_target $pos { $redirect_src_ip $redirect_dest_ip } { \
-                       $srcaddr $srcdaddr \
-                       ${redirect_proto:+-p $redirect_proto} \
-                       ${srcports:+--sport $srcports} \
-                       ${srcdports:+--dport $srcdports} \
-                       ${redirect_src_mac:+-m mac --mac-source $redirect_src_mac} \
-                       $natopt $nataddr${natports:+:$natports} \
-               }
-
-               [ -n "$destaddr" ] && \
-               fw add $mode f ${fwdchain:-forward} ACCEPT ^ { $redirect_src_ip $redirect_dest_ip } { \
-                       $srcaddr $destaddr \
-                       ${redirect_proto:+-p $redirect_proto} \
-                       ${srcports:+--sport $srcports} \
-                       ${destports:+--dport $destports} \
-                       ${redirect_src_mac:+-m mac --mac-source $redirect_src_mac} \
-               }
+       local pr; for pr in $redirect_proto; do
+               fw_get_negation pr '-p' "$pr"
+               local sm; for sm in ${redirect_src_mac:-""}; do
+                       fw_get_negation sm '--mac-source' "$sm"
+                       fw add $mode n $natchain $redirect_target + \
+                               { $redirect_src_ip $redirect_dest_ip } { \
+                               $srcaddr $srcdaddr $pr \
+                               $srcports $srcdports \
+                               ${sm:+-m mac $sm} \
+                               $natopt $nataddr${natports:+:$natports} \
+                               $redirect_options \
+                       }
+
+                       fw add $mode f ${fwdchain:-forward} ACCEPT + \
+                               { $redirect_src_ip $redirect_dest_ip } { \
+                               $srcaddr ${destaddr:--m conntrack --ctstate DNAT} \
+                               $pr \
+                               $srcports $destports \
+                               ${sm:+-m mac $sm} \
+                               $redirect_extra \
+                       }
+               done
        done
 
        fw_callback post redirect