X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Ffirewall%2Ffiles%2Flib%2Fcore_redirect.sh;h=64c619e434fe0b8203875ccbb8af2d3c11c4ba46;hb=a9977eca9145b9f061ceb1d1604f59efba1b2949;hp=87941a2a174d3425a5acb49eb076657ce90da6d5;hpb=095946758305cbef0391a557fe02adc755b4a60a;p=openwrt%2F.git

diff --git a/package/firewall/files/lib/core_redirect.sh b/package/firewall/files/lib/core_redirect.sh
index 87941a2a17..64c619e434 100644
--- a/package/firewall/files/lib/core_redirect.sh
+++ b/package/firewall/files/lib/core_redirect.sh
@@ -34,7 +34,7 @@ fw_load_redirect() {
 			return 0
 		}
 
-		fwdchain="zone_${redirect_src}_forward"
+		fwdchain="zone_${redirect_src}${redirect_dest_ip:+_forward}"
 
 		natopt="--to-destination"
 		natchain="zone_${redirect_src}_prerouting"
@@ -100,9 +100,8 @@ fw_load_redirect() {
 			$natopt $nataddr${natports:+:$natports} \
 		}
 
-		[ -n "$destaddr" ] && \
 		fw add $mode f ${fwdchain:-forward} ACCEPT ^ { $redirect_src_ip $redirect_dest_ip } { \
-			$srcaddr $destaddr \
+			$srcaddr ${destaddr:--m conntrack --ctstate DNAT} \
 			${redirect_proto:+-p $redirect_proto} \
 			${srcports:+--sport $srcports} \
 			${destports:+--dport $destports} \