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

Correct nested Zone sort order

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5466 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-08 21:41:05 +00:00
parent e3f9325a70
commit 70a60971dc
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
New/compiler.pl
View File

@ -135,6 +135,7 @@ my $line; # Current config file line
my @zones; my @zones;
my %zones; my %zones;
my %zone_children;
my %zone_parents; my %zone_parents;
my %zone_hosts; my %zone_hosts;
my %zone_options; my %zone_options;
@ -398,11 +399,12 @@ sub parse_zone_option_list($)
# #
# Parse the zones file. Generates the following information: # Parse the zones file. Generates the following information:
# #
# zones => <zone type> # zones => <zone type>
# zone_parents => <List of parent zones> # zone_children => <Ref to Empty List>
# zone_options => in_out => mss => <mss value> # zone_parents => <List of parent zones>
# => ipsec => "ipsec selection string" # zone_options => in_out => mss => <mss value>
# => routeback => 1 # => ipsec => "ipsec selection string"
# => routeback => 1
# in ... # in ...
# out ... # out ...
# #
@ -430,6 +432,7 @@ sub determine_zones()
fatal_error "Invalid Parent List ($2)" unless $p; fatal_error "Invalid Parent List ($2)" unless $p;
fatal_error "Unknown parent zone ($p)" unless $zones{$p}; fatal_error "Unknown parent zone ($p)" unless $zones{$p};
fatal_error 'Subzones of firewall zone not allowed' if $zones{$p} eq 'firewall'; fatal_error 'Subzones of firewall zone not allowed' if $zones{$p} eq 'firewall';
push @{$zone_children{$p}}, $zone;
} }
} }
@ -468,6 +471,7 @@ sub determine_zones()
$zone_options{$zone} = \%zone_hash; $zone_options{$zone} = \%zone_hash;
$zone_interfaces{$zone} = {}; $zone_interfaces{$zone} = {};
$zone_children{$zone} = [];
push @z, $zone; push @z, $zone;
} }
@ -483,8 +487,8 @@ sub determine_zones()
ZONE: ZONE:
for my $zone ( @z ) { for my $zone ( @z ) {
unless ( $ordered{$zone} ) { unless ( $ordered{$zone} ) {
for my $parent ( @{$zone_parents{$zone}} ) { for my $child ( @{$zone_children{$zone}} ) {
next ZONE unless $ordered{$parent}; next ZONE unless $ordered{$child};
} }
$ordered{$zone} = 1; $ordered{$zone} = 1;
push @zones, $zone; push @zones, $zone;