Cosmetic changes to Zones.pm source

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-03 07:29:13 -08:00
parent b5e3a41e13
commit 99e0a340b1

View File

@ -611,11 +611,14 @@ sub zone_report()
for my $interface ( sort keys %$interfaceref ) { for my $interface ( sort keys %$interfaceref ) {
my $iref = $interfaces{$interface}; my $iref = $interfaces{$interface};
my $arrayref = $interfaceref->{$interface}; my $arrayref = $interfaceref->{$interface};
for my $groupref ( @$arrayref ) { for my $groupref ( @$arrayref ) {
my $hosts = $groupref->{hosts}; my $hosts = $groupref->{hosts};
if ( $hosts ) { if ( $hosts ) {
my $grouplist = join ',', ( @$hosts ); my $grouplist = join ',', ( @$hosts );
my $exclusions = join ',', @{$groupref->{exclusions}}; my $exclusions = join ',', @{$groupref->{exclusions}};
$grouplist = join '!', ( $grouplist, $exclusions) if $exclusions; $grouplist = join '!', ( $grouplist, $exclusions) if $exclusions;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
@ -626,7 +629,6 @@ sub zone_report()
$printed = 1; $printed = 1;
} }
} }
} }
} }
} }
@ -662,6 +664,7 @@ sub dump_zone_contents() {
for my $interface ( sort keys %$interfaceref ) { for my $interface ( sort keys %$interfaceref ) {
my $iref = $interfaces{$interface}; my $iref = $interfaces{$interface};
my $arrayref = $interfaceref->{$interface}; my $arrayref = $interfaceref->{$interface};
for my $groupref ( @$arrayref ) { for my $groupref ( @$arrayref ) {
my $hosts = $groupref->{hosts}; my $hosts = $groupref->{hosts};