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

Revert "Assign marks to according to GROUP zones"

Browse Source 
This reverts commit 3fbfafb6e3.
This commit is contained in:
Tom Eastep 2012-09-02 11:06:28 -07:00
parent c31c9bca9c
commit a6740c6c53
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4578,9 +4578,9 @@ sub get_configuration( $$$ ) {
$globals{PROVIDER_MASK} = make_mask( $config{PROVIDER_BITS} ) << $config{PROVIDER_OFFSET};
if ( $config{ZONE_BITS} ) {
$globals{ZONE_MASK} = $globals{ZONE_MASK1} = make_mask( $config{ZONE_BITS} ) << $globals{ZONE_OFFSET};
$globals{ZONE_MASK} = make_mask( $config{ZONE_BITS} ) << $globals{ZONE_OFFSET};
} else {
$globals{ZONE_MASK} = $globals{ZONE_MASK1} = 0;
$globals{ZONE_MASK} = 0;
}
if ( ( my $userbits = $config{PROVIDER_OFFSET} - $config{TC_BITS} ) > 0 ) {

18
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -527,20 +527,10 @@ sub process_zone( \$ ) {
$mark = 0;
} else {
unless ( $zoneref->{options}{in_out}{nomark} ) {
if ( $type == GROUP ) {
$zonemarklimit >>= 1;
fatal_error "Zone mark overflow - please increase the setting of ZONE_BITS" if $zonemark >= $zonemarklimit;
$mark = $zonemarklimit;
} else {
fatal_error "Zone mark overflow - please increase the setting of ZONE_BITS" if $zonemark >= $zonemarklimit;
$mark = $zonemark;
$zonemark += $zonemarkincr;
$zoneref->{complex} = 1;
for ( @parents ) {
$mark |= $zones{$_}{mark} if $zones{$_}{type} == GROUP;
}
}
fatal_error "Zone mark overflow - please increase the setting of ZONE_BITS" if $zonemark >= $zonemarklimit;
$mark = $zonemark;
$zonemark += $zonemarkincr;
$zoneref->{complex} = 1;
}
}