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

Revert "Match section rules to the number of mark rules"

Browse Source 
This reverts commit 1699d8e941.
This commit is contained in:
Tom Eastep 2009-11-28 07:19:41 -08:00
parent 0b1621027b
commit f21c71d7a6
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1148,17 +1148,7 @@ sub finish_chain_section ($$) {
$comment = ''; $comment = '';
unless ( $config{FASTACCEPT} ) { add_rule $chainref, "-m state --state $state -j ACCEPT" unless $config{FASTACCEPT};
if ( $chainref->{marked} ) {
if ( $chainref->{marked} == @{$chainref->{rules}} ) {
insert_rule( $chainref, 0, "-m state --state $state -j ACCEPT" );
} else {
add_rule $chainref, "-m state --state $state -j ACCEPT";
}
} else {
add_rule $chainref, "-m state --state $state -j ACCEPT";
}
}
if ($sections{NEW} ) { if ($sections{NEW} ) {
if ( $chainref->{is_policy} ) { if ( $chainref->{is_policy} ) {

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

@ -136,8 +136,10 @@ sub add_or_modify_policy_chain( $$ ) {
my $mark = defined_zone( $zone )->{mark}; my $mark = defined_zone( $zone )->{mark};
my $mark1 = defined_zone( $zone1 )->{mark} << VIRTUAL_BITS; my $mark1 = defined_zone( $zone1 )->{mark} << VIRTUAL_BITS;
$chainref->{marked} = 1, add_rule $chainref, '-j MARK --or-mark ' . in_hex($mark) if $mark && $zone1 eq firewall_zone; add_rule $chainref, '-j MARK --or-mark ' . in_hex($mark) if $mark && $zone1 eq firewall_zone;
$chainref->{marked}++ , add_rule $chainref, '-j MARK --or-mark ' . in_hex($mark1) if $mark1; add_rule $chainref, '-j MARK --or-mark ' . in_hex($mark1) if $mark1;
$chainref->{marked} = 1;
} }
} }