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

Enable OPT 16 in check -r; Suppress duplicate rules

Browse Source
This commit is contained in:
Tom Eastep 2011-11-25 16:05:07 -08:00
parent 90e03e1833
commit 613e41c25a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -2945,6 +2945,8 @@ sub combine_dports {
last RULE unless $key eq 'multiport' && $multi_sports eq get_multi_sports( $ruleref ); last RULE unless $key eq 'multiport' && $multi_sports eq get_multi_sports( $ruleref );
} }
next RULE if $ports1 eq $ports2;
last if ( $ports += port_count( $ports2 ) ) > 15; last if ( $ports += port_count( $ports2 ) ) > 15;
if ( $comment2 ) { if ( $comment2 ) {

4
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -868,7 +868,7 @@ sub compiler {
# #
generate_matrix; generate_matrix;
if ( $config{OPTIMIZE} & 0xE ) { if ( $config{OPTIMIZE} & 0x1E ) {
progress_message2 'Optimizing Ruleset...'; progress_message2 'Optimizing Ruleset...';
# #
# Optimize Policy Chains # Optimize Policy Chains
@ -877,7 +877,7 @@ sub compiler {
# #
# Ruleset Optimization # Ruleset Optimization
# #
optimize_ruleset if $config{OPTIMIZE} & 0xC; optimize_ruleset if $config{OPTIMIZE} & 0x1C;
} }
enable_script if $debug; enable_script if $debug;