[package] firewall: insert SNAT and DNAT rules according to the order of the configur...

[openwrt/svn-archive/archive.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 9654e7177c58e12b9a96560fe6284c06d299a9b5..87941a2a174d3425a5acb49eb076657ce90da6d5 100644 (file)
--- a/package/firewall/files/lib/core_redirect.sh
+++ b/package/firewall/files/lib/core_redirect.sh
@@ -88,7 +88,10 @@ fw_load_redirect() {
 
        [ "$redirect_proto" == "tcpudp" ] && redirect_proto="tcp udp"
        for redirect_proto in $redirect_proto; do
-               fw add $mode n $natchain $redirect_target ^ { $redirect_src_ip $redirect_dest_ip } { \
+               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} \