A little optimization in macro handling

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8136 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-02-03 00:07:58 +00:00
parent d0fd40ae0b
commit 8a6e2f1712

View File

@ -883,13 +883,19 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
$mdest = '';
}
$mproto = merge_macro_column $mproto, $proto;
$mports = merge_macro_column $mports, $ports;
$msports = merge_macro_column $msports, $sports;
$mrate = merge_macro_column $mrate, $rate;
$muser = merge_macro_column $muser, $user;
process_rule1 $mtarget, $msource, $mdest, $mproto, $mports, $msports, $origdest, $mrate, $muser, $mark, $wildcard;
process_rule1(
$mtarget,
$msource,
$mdest,
merge_macro_column( $mproto, $proto ) ,
merge_macro_column( $mports, $ports ) ,
merge_macro_column( $msports, $sports ) ,
$origdest,
merge_macro_column( $mrate, $rate ) ,
merge_macro_column( $muser, $user ) ,
$mark,
$wildcard
);
progress_message " Rule \"$currentline\" $done";
}