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

Merge NFACCT and EXPENSIVE matches during optimization

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-06-02 13:29:13 -07:00
parent 7dbd50708b
commit 481811d29f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1121,7 +1121,7 @@ sub merge_rules( $$$ ) {
}
}
for my $option ( grep ! $opttype{$_}, keys %$fromref ) {
for my $option ( grep ! $opttype{$_} || $_ eq 'nfacct', keys %$fromref ) {
set_rule_option( $toref, $option, $fromref->{$option} );
}
@ -1137,6 +1137,10 @@ sub merge_rules( $$$ ) {
set_rule_option( $toref, 'policy', $fromref->{policy} ) if exists $fromref->{policy};
for my $option ( grep( ( $opttype{$_} || 0 ) == EXPENSIVE, keys %$fromref ) ) {
set_rule_option( $toref, $option, $fromref->{$option} );
}
unless ( $toref->{comment} ) {
$toref->{comment} = $fromref->{comment} if exists $fromref->{comment};
}