extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-15 04:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Small optimization in virtual zones"

Browse Source 
This reverts commit 251d7116c8.
This commit is contained in:
Tom Eastep 2009-11-28 07:20:01 -08:00
parent f21c71d7a6
commit 038b84e775
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,12 +133,8 @@ sub add_or_modify_policy_chain( $$ ) {
}
unless ( $chainref->{marked} ) {
my $mark = defined_zone( $zone )->{mark};
my $mark1 = defined_zone( $zone1 )->{mark} << VIRTUAL_BITS;
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($mark1) if $mark1;
my $mark = defined_zone( $zone )->{mark} | ( defined_zone( $zone1 )->{mark} << VIRTUAL_BITS );
add_rule $chainref, '-j MARK --or-mark ' . in_hex($mark) if $mark;
$chainref->{marked} = 1;
}

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

@ -1698,8 +1698,6 @@ sub generate_matrix() {
#
my $frwd_ref = new_standard_chain zone_forward_chain( $zone );
add_rule $frwd_ref, '-j MARK --set-mark ' . in_hex( $zoneref->{mark} ) if $zoneref->{mark};
if ( $capabilities{POLICY_MATCH} ) {
#
# Because policy match only matches an 'in' or an 'out' policy (but not both), we have to place the