extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-21 10:18:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow simple zone lists in rules

Browse Source
This commit is contained in:
Tom Eastep 2010-08-18 07:26:38 -07:00
parent baf8e21a80
commit 7a17b65368
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ our @EXPORT = qw( process_tos
compile_stop_firewall compile_stop_firewall
); );
our @EXPORT_OK = qw( process_rule process_rule1 initialize ); our @EXPORT_OK = qw( process_rule process_rule1 initialize );
our $VERSION = '4.4_12'; our $VERSION = '4.4_13';
# #
# Set to one if we find a SECTION # Set to one if we find a SECTION
@ -1603,6 +1603,10 @@ sub process_rule ( ) {
} }
unshift @source, firewall_zone if $includesrcfw; unshift @source, firewall_zone if $includesrcfw;
$source = '';
} elsif ( $source !~ /:/ && $source =~ /,/ ) {
@source = split ',', $source;
} }
if ( $dest eq 'all' ) { if ( $dest eq 'all' ) {
@ -1613,13 +1617,15 @@ sub process_rule ( ) {
} }
unshift @dest, firewall_zone if $includedstfw; unshift @dest, firewall_zone if $includedstfw;
} elsif ( $dest !~ /:/ && $dest =~ /,/ ) {
@dest = split /,/, $dest;
} }
fatal_error "Invalid or missing ACTION ($target)" unless defined $action; fatal_error "Invalid or missing ACTION ($target)" unless defined $action;
if ( $source eq 'all' ) { if ( @source ) {
for my $zone ( @source ) { for my $zone ( @source ) {
if ( $dest eq 'all' ) { if ( @dest ) {
for my $zone1 ( @dest ) { for my $zone1 ( @dest ) {
if ( $intrazone || ( $zone ne $zone1 ) ) { if ( $intrazone || ( $zone ne $zone1 ) ) {
process_rule1 $target, $zone, $zone1 , $proto, $ports, $sports, $origdest, $ratelimit, $user, $mark, $connlimit, $time, 1; process_rule1 $target, $zone, $zone1 , $proto, $ports, $sports, $origdest, $ratelimit, $user, $mark, $connlimit, $time, 1;
@ -1633,7 +1639,7 @@ sub process_rule ( ) {
} }
} }
} }
} elsif ( $dest eq 'all' ) { } elsif ( @dest ) {
for my $zone ( @dest ) { for my $zone ( @dest ) {
my $sourcezone = ( split( /:/, $source, 2 ) )[0]; my $sourcezone = ( split( /:/, $source, 2 ) )[0];
if ( ( $sourcezone ne $zone ) || $intrazone ) { if ( ( $sourcezone ne $zone ) || $intrazone ) {