Fix action DEST handling -- Take 2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6203 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-03 00:31:50 +00:00
parent 8cafcac8db
commit 6ade694060

View File

@ -147,7 +147,8 @@ add_an_action()
;; ;;
*:*) *:*)
action_interface_verify ${server%:*} action_interface_verify ${server%:*}
serv="$(match_dest_dev ${server%:*}) $(dest_ip_range ${server#*:})" dest_interface=$(match_dest_dev ${server%:*})
serv=${server#*:}
;; ;;
*.*.*|+*|!+*) *.*.*|+*|!+*)
serv=$server serv=$server
@ -218,11 +219,11 @@ add_an_action()
for srv in $(firewall_ip_range $serv1); do for srv in $(firewall_ip_range $serv1); do
if [ -n "$loglevel" ]; then if [ -n "$loglevel" ]; then
log_rule_limit $loglevel $chain1 $action $logtarget "$ratelimit" "$logtag" -A $user \ log_rule_limit $loglevel $chain1 $action $logtarget "$ratelimit" "$logtag" -A $user \
$(fix_bang $proto $sports $multiport $cli $(dest_ip_range $srv) $dports) $(fix_bang $proto $sports $multiport $cli $(dest_ip_range $srv) $dest_interface $dports)
fi fi
run_iptables2 -A $chain1 $proto $multiport $cli $sports \ run_iptables2 -A $chain1 $proto $multiport $cli $sports \
$(dest_ip_range $srv) $dports $ratelimit $user -j $target $(dest_ip_range $srv) $dest_interface $dports $ratelimit $user -j $target
done done
done done
else else