holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

A little optimization in macro handling

Browse Source 
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
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Shorewall-perl/Shorewall/Rules.pm
View File

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