X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Ffirewall%2Ffiles%2Flib%2Fcore_redirect.sh;fp=package%2Ffirewall%2Ffiles%2Flib%2Fcore_redirect.sh;h=2f0e38f393c41d9a65d27f8456c68a3f74507a56;hb=5ab58aa39c43eca75866fc478445821bb45b4125;hp=913f963562d4b6885506030393531d92bbf5d506;hpb=eb79296cc10f6168892278b4aa921566178b1f20;p=openwrt%2Fstaging%2Fchunkeey.git diff --git a/package/firewall/files/lib/core_redirect.sh b/package/firewall/files/lib/core_redirect.sh index 913f963562..2f0e38f393 100644 --- a/package/firewall/files/lib/core_redirect.sh +++ b/package/firewall/files/lib/core_redirect.sh @@ -31,13 +31,15 @@ fw_load_redirect() { fw_die "redirect ${redirect_name}: needs src and dest_ip or dest_port" } - local chain destopt + local chain destopt destaddr if [ "$redirect_target" == "DNAT" ]; then chain="zone_${redirect_src}_prerouting" destopt="--to-destination" + destaddr="$redirect_dest_ip" elif [ "$redirect_target" == "SNAT" ]; then chain="zone_${redirect_src}_nat" destopt="--to-source" + destaddr="$redirect_src_dip" else fw_die "redirect ${redirect_name}: target must be either DNAT or SNAT" fi @@ -65,9 +67,9 @@ fw_load_redirect() { $destopt ${redirect_dest_ip}${redirect_dest_port:+:$nat_dest_port} \ } - [ -n "$redirect_dest_ip" ] && \ + [ -n "$destaddr" ] && \ fw add $mode f zone_${redirect_src}_forward ACCEPT ^ { $redirect_src_ip $redirect_dest_ip } { \ - -d $redirect_dest_ip \ + -d $destaddr \ ${redirect_proto:+-p $redirect_proto} \ ${redirect_src_ip:+-s $redirect_src_ip/$redirect_src_ip_prefixlen} \ ${redirect_src_port:+--sport $redirect_src_port} \