extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 17:28:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate an ugly 'our' variable.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-08-19 12:00:52 -07:00
parent 676da7a2f1
commit 2a9bbbfe62
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1527,15 +1527,13 @@ sub process_section ($) {
# #
# Build a source or destination zone list # Build a source or destination zone list
# #
sub build_zone_list( $$$ ) { sub build_zone_list( $$$\$ ) {
my ($fw, $input, $which ) = @_; my ($fw, $input, $which, $intrazoneref ) = @_;
my $any = ( $input =~ s/^any/all/ ); my $any = ( $input =~ s/^any/all/ );
my $exclude; my $exclude;
my $rest; my $rest;
my %exclude; my %exclude;
my @result; my @result;
our $intrazone;
# #
# Handle Wildcards # Handle Wildcards
# #
@ -1555,9 +1553,9 @@ sub build_zone_list( $$$ ) {
unless ( $input eq 'all' ) { unless ( $input eq 'all' ) {
if ( $input eq 'all+' ) { if ( $input eq 'all+' ) {
$intrazone = 1; $$intrazoneref = 1;
} elsif ( ( $input eq 'all+-' ) || ( $input eq 'all-+' ) ) { } elsif ( ( $input eq 'all+-' ) || ( $input eq 'all-+' ) ) {
$intrazone = 1; $$intrazoneref = 1;
$exclude{$fw} = 1; $exclude{$fw} = 1;
} elsif ( $input eq 'all-' ) { } elsif ( $input eq 'all-' ) {
$exclude{$fw} = 1; $exclude{$fw} = 1;
@ -1574,7 +1572,7 @@ sub build_zone_list( $$$ ) {
$input = $1; $input = $1;
$rest = $2; $rest = $2;
$intrazone = ( $input =~ s/\+$// ); $$intrazoneref = ( $input =~ s/\+$// );
@result = split_list $input, 'zone'; @result = split_list $input, 'zone';
} else { } else {
@ -1612,8 +1610,7 @@ sub process_rule ( ) {
return 1; return 1;
} }
our $intrazone = 0; my $intrazone = 0;
my $wild = 0; my $wild = 0;
my $thisline = $currentline; #We must save $currentline because it is overwritten by macro expansion my $thisline = $currentline; #We must save $currentline because it is overwritten by macro expansion
my $action = isolate_basic_target $target; my $action = isolate_basic_target $target;
@ -1623,8 +1620,8 @@ sub process_rule ( ) {
fatal_error "Invalid or missing ACTION ($target)" unless defined $action; fatal_error "Invalid or missing ACTION ($target)" unless defined $action;
@source = build_zone_list ( $fw, $source, 'SOURCE' ); @source = build_zone_list ( $fw, $source, 'SOURCE', $intrazone );
@dest = build_zone_list ( $fw, $dest, 'DEST' ); @dest = build_zone_list ( $fw, $dest, 'DEST' , $intrazone );
$wild = ( @source > 1 ) || ( @dest > 1 ); $wild = ( @source > 1 ) || ( @dest > 1 );