brcm47xx: run ssb_pcicore_fix_sprom_core_index just for ssb bus on pci

[openwrt.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 913f963..a3e70d4 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
 }
@@ -27,53 +27,92 @@ fw_load_redirect() {
 
        fw_callback pre redirect
 
-       [ -n "$redirect_src" -a -n "$redirect_dest_ip$redirect_dest_port" ] || {
-               fw_die "redirect ${redirect_name}: needs src and dest_ip or dest_port"
-       }
-
-       local chain destopt
+       local fwdchain natchain natopt nataddr natports srcdaddr srcdports
        if [ "$redirect_target" == "DNAT" ]; then
-               chain="zone_${redirect_src}_prerouting"
-               destopt="--to-destination"
+               [ -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}${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_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
-               chain="zone_${redirect_src}_nat"
-               destopt="--to-source"
+               [ -n "${redirect_dest#*}" -a -n "$redirect_src_dip" ] || {
+                       fw_log error "SNAT redirect ${redirect_name}: needs dest and src_dip, skipping"
+                       return 0
+               }
+
+               fwdchain="${redirect_src:+zone_${redirect_src}_forward}"
+
+               natopt="--to-source"
+               natchain="zone_${redirect_dest}_nat"
+               nataddr="$redirect_src_dip"
+               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
+
        else
-               fw_die "redirect ${redirect_name}: target must be either DNAT or SNAT"
+               fw_log error "redirect ${redirect_name}: target must be either DNAT or SNAT, skipping"
+               return 0
        fi
 
-       list_contains FW_CONNTRACK_ZONES $redirect_src || \
-               append FW_CONNTRACK_ZONES $redirect_src
+       local mode
+       fw_get_family_mode mode ${redirect_family:-x} ${redirect_src:-$redirect_dest} I
 
-       local mode=$(fw_get_family_mode ${redirect_family:-x} $redirect_src I)
+       local srcaddr
+       fw_get_negation srcaddr '-s' "${redirect_src_ip:+$redirect_src_ip/$redirect_src_ip_prefixlen}"
 
-       local nat_dest_port=$redirect_dest_port
-       redirect_dest_port=$(fw_get_port_range $redirect_dest_port)
-       redirect_src_port=$(fw_get_port_range $redirect_src_port)
-       redirect_src_dport=$(fw_get_port_range $redirect_src_dport)
-       local fwd_dest_port=${redirect_dest_port:-$redirect_src_dport}
+       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
-               fw add $mode n $chain $redirect_target $ { $redirect_src_ip $redirect_dest_ip } { \
-                       ${redirect_proto:+-p $redirect_proto} \
-                       ${redirect_src_ip:+-s $redirect_src_ip/$redirect_src_ip_prefixlen} \
-                       ${redirect_src_dip:+-d $redirect_src_dip/$redirect_src_dip_prefixlen} \
-                       ${redirect_src_port:+--sport $redirect_src_port} \
-                       ${redirect_src_dport:+--dport $redirect_src_dport} \
-                       ${redirect_src_mac:+-m mac --mac-source $redirect_src_mac} \
-                       $destopt ${redirect_dest_ip}${redirect_dest_port:+:$nat_dest_port} \
-               }
+       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 \
+                       }
 
-               [ -n "$redirect_dest_ip" ] && \
-               fw add $mode f zone_${redirect_src}_forward ACCEPT ^ { $redirect_src_ip $redirect_dest_ip } { \
-                       -d $redirect_dest_ip \
-                       ${redirect_proto:+-p $redirect_proto} \
-                       ${redirect_src_ip:+-s $redirect_src_ip/$redirect_src_ip_prefixlen} \
-                       ${redirect_src_port:+--sport $redirect_src_port} \
-                       ${fwd_dest_port:+--dport $fwd_dest_port} \
-                       ${redirect_src_mac:+-m mac --mac-source $redirect_src_mac} \
-               }
+                       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