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

Move $line to Config.pm and rename $currentline

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6800 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-07 16:34:38 +00:00
parent a0b0a79f93
commit ff4b68c2da
12 changed files with 58 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Chains.pm
View File

@ -317,11 +317,11 @@ INIT {
# #
# #
# Process a COMMENT line (in $line) # Process a COMMENT line (in $currentline)
# #
sub process_comment() { sub process_comment() {
if ( $capabilities{COMMENTS} ) { if ( $capabilities{COMMENTS} ) {
( $comment = $line ) =~ s/^\s*COMMENT\s*//; ( $comment = $currentline ) =~ s/^\s*COMMENT\s*//;
$comment =~ s/\s*$//; $comment =~ s/\s*$//;
} else { } else {
warning_message "COMMENT ignored -- requires comment support in iptables/Netfilter"; warning_message "COMMENT ignored -- requires comment support in iptables/Netfilter";
@ -378,7 +378,7 @@ sub add_file( $$ ) {
qq(progress_message "Processing $file..."), qq(progress_message "Processing $file..."),
'' ); '' );
while ( $line = <EF> ) { while ( my $line = <EF> ) {
chomp $line; chomp $line;
add_command $chainref, $line; add_command $chainref, $line;
} }

4
Shorewall-perl/Shorewall/Common.pm
View File

@ -54,7 +54,6 @@ our @EXPORT = qw(
create_temp_aux_config create_temp_aux_config
finalize_aux_config finalize_aux_config
$line
$command $command
$doing $doing
$done $done
@ -63,7 +62,6 @@ our @EXPORT = qw(
our @EXPORT_OK = qw( $timestamp initialize ); our @EXPORT_OK = qw( $timestamp initialize );
our $VERSION = 4.00; our $VERSION = 4.00;
our $line;
our ($command, $doing, $done ); our ($command, $doing, $done );
our $verbose; our $verbose;
our $timestamp; our $timestamp;
@ -83,8 +81,6 @@ our $tempfile; # Temporary File Name
# #
sub initialize() { sub initialize() {
$line = ''; # Current config file line
( $command, $doing, $done ) = qw/ compile Compiling Compiled/; #describe the current command, it's present progressive, and it's completion. ( $command, $doing, $done ) = qw/ compile Compiling Compiled/; #describe the current command, it's present progressive, and it's completion.
$verbose = 0; # Verbosity setting. 0 = almost silent, 1 = major progress messages only, 2 = all progress messages (very noisy) $verbose = 0; # Verbosity setting. 0 = almost silent, 1 = major progress messages only, 2 = all progress messages (very noisy)

2
Shorewall-perl/Shorewall/Compiler.pm
View File

@ -511,7 +511,7 @@ sub generate_script_2 () {
emit 'cat > ${VARDIR}/.modules << EOF'; emit 'cat > ${VARDIR}/.modules << EOF';
open_file $fn; open_file $fn;
while ( read_a_line ) { while ( read_a_line ) {
emit_unindented $line; emit_unindented $currentline;
} }
emit_unindented 'EOF'; emit_unindented 'EOF';
emit 'reload_kernel_modules < ${VARDIR}/.modules'; emit 'reload_kernel_modules < ${VARDIR}/.modules';

75
Shorewall-perl/Shorewall/Config.pm
View File

@ -60,6 +60,7 @@ our @EXPORT = qw(
run_user_exit2 run_user_exit2
generate_aux_config generate_aux_config
$currentline
%config %config
%globals %globals
%capabilities ); %capabilities );
@ -101,6 +102,7 @@ our @includestack;
# #
our @openstack; our @openstack;
our $currentline; # Current config file line image
our $currentfile; # File handle reference our $currentfile; # File handle reference
our $currentfilename; # File NAME our $currentfilename; # File NAME
our $currentlinenumber; # Line number our $currentlinenumber; # Line number
@ -303,6 +305,7 @@ sub initialize() {
# #
@openstack = (); @openstack = ();
$currentline = ''; # Line image
$currentfile = undef; # File handle reference $currentfile = undef; # File handle reference
$currentfilename = ''; # File NAME $currentfilename = ''; # File NAME
$currentlinenumber = 0; # Line number $currentlinenumber = 0; # Line number
@ -321,12 +324,12 @@ INIT {
# #
sub warning_message sub warning_message
{ {
my $lineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : ''; my $currentlineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : '';
if ( $debug ) { if ( $debug ) {
print STDERR Carp::longmess( " WARNING: @_$lineinfo" ); print STDERR Carp::longmess( " WARNING: @_$currentlineinfo" );
} else { } else {
print STDERR " WARNING: @_$lineinfo\n"; print STDERR " WARNING: @_$currentlineinfo\n";
} }
} }
@ -334,9 +337,9 @@ sub warning_message
# Issue fatal error message and die # Issue fatal error message and die
# #
sub fatal_error { sub fatal_error {
my $lineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : ''; my $currentlineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : '';
Carp::confess " ERROR: @_$lineinfo" if $debug; Carp::confess " ERROR: @_$currentlineinfo" if $debug;
die " ERROR: @_$lineinfo\n"; die " ERROR: @_$currentlineinfo\n";
} }
# #
@ -382,9 +385,9 @@ sub find_file($)
sub split_line( $$$ ) { sub split_line( $$$ ) {
my ( $mincolumns, $maxcolumns, $description ) = @_; my ( $mincolumns, $maxcolumns, $description ) = @_;
fatal_error "Shorewall Configuration file entries may not contain single quotes, double quotes, single back quotes or backslashes" if $line =~ /["'`\\]/; fatal_error "Shorewall Configuration file entries may not contain single quotes, double quotes, single back quotes or backslashes" if $currentline =~ /["'`\\]/;
my @line = split( ' ', $line ); my @line = split( ' ', $currentline );
fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns; fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns;
fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns; fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns;
@ -400,13 +403,13 @@ sub split_line( $$$ ) {
sub split_line1( $$$ ) { sub split_line1( $$$ ) {
my ( $mincolumns, $maxcolumns, $description ) = @_; my ( $mincolumns, $maxcolumns, $description ) = @_;
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $line =~ /["`\\]/; fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $currentline =~ /["`\\]/;
my @line = split( ' ', $line ); my @line = split( ' ', $currentline );
return @line if $line[0] eq 'COMMENT'; return @line if $line[0] eq 'COMMENT';
fatal_error "Shorewall Configuration file entries may not contain single quotes" if $line =~ /'/; fatal_error "Shorewall Configuration file entries may not contain single quotes" if $currentline =~ /'/;
fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns; fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns;
fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns; fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns;
@ -429,9 +432,9 @@ my %no_pad = ( COMMENT => 0,
sub split_line2( $$$ ) { sub split_line2( $$$ ) {
my ( $mincolumns, $maxcolumns, $description ) = @_; my ( $mincolumns, $maxcolumns, $description ) = @_;
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $line =~ /["`\\]/; fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $currentline =~ /["`\\]/;
my @line = split( ' ', $line ); my @line = split( ' ', $currentline );
my $first = $line[0]; my $first = $line[0];
my $columns = $no_pad{$first}; my $columns = $no_pad{$first};
@ -441,7 +444,7 @@ sub split_line2( $$$ ) {
return @line return @line
} }
fatal_error "Shorewall Configuration file entries may not contain single quotes" if $line =~ /'/; fatal_error "Shorewall Configuration file entries may not contain single quotes" if $currentline =~ /'/;
fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns; fatal_error "Invalid $description entry (too few columns)" if @line < $mincolumns;
fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns; fatal_error "Invalid $description entry (too many columns)" if @line > $maxcolumns;
@ -530,7 +533,7 @@ sub pop_open() {
sub read_a_line { sub read_a_line {
while ( $currentfile ) { while ( $currentfile ) {
$line = ''; $currentline = '';
while ( <$currentfile> ) { while ( <$currentfile> ) {
@ -540,28 +543,28 @@ sub read_a_line {
# #
# Continuation # Continuation
# #
chop $line, next if substr( ( $line .= $_ ), -1, 1 ) eq '\\'; chop $currentline, next if substr( ( $currentline .= $_ ), -1, 1 ) eq '\\';
$line =~ s/#.*$//; # Remove Trailing Comments -- result might be a blank line $currentline =~ s/#.*$//; # Remove Trailing Comments -- result might be a blank line
# #
# Ignore ( concatenated ) Blank Lines # Ignore ( concatenated ) Blank Lines
# #
$line = '', next if $line =~ /^\s*$/; $currentline = '', next if $currentline =~ /^\s*$/;
# #
# Expand Shell Variables using %ENV # Expand Shell Variables using %ENV
# #
while ( $line =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/ || $line =~ /^(.*?)\${([a-zA-Z]\w*)}(.*)$/ ) { while ( $currentline =~ /^(.*?)\$([a-zA-Z]\w*)(.*)$/ || $currentline =~ /^(.*?)\${([a-zA-Z]\w*)}(.*)$/ ) {
my $val = $ENV{$2}; my $val = $ENV{$2};
$val = '' unless defined $val; $val = '' unless defined $val;
$line = join( '', $1 , $val , $3 ); $currentline = join( '', $1 , $val , $3 );
} }
if ( $line =~ /^\s*INCLUDE\s/ ) { if ( $currentline =~ /^\s*INCLUDE\s/ ) {
my @line = split ' ', $line; my @line = split ' ', $currentline;
fatal_error "Invalid INCLUDE command: $line" if @line != 2; fatal_error "Invalid INCLUDE command: $currentline" if @line != 2;
fatal_error "INCLUDEs nested too deeply: $line" if @includestack >= 4; fatal_error "INCLUDEs nested too deeply: $currentline" if @includestack >= 4;
my $filename = find_file $line[1]; my $filename = find_file $line[1];
@ -573,7 +576,7 @@ sub read_a_line {
do_open_file $filename; do_open_file $filename;
} }
$line = ''; $currentline = '';
} else { } else {
return 1; return 1;
} }
@ -588,12 +591,12 @@ sub read_a_line {
# #
sub read_a_line1 { sub read_a_line1 {
while ( $currentfile ) { while ( $currentfile ) {
while ( $line = <$currentfile> ) { while ( $currentline = <$currentfile> ) {
$currentlinenumber++; $currentlinenumber++;
next if $line =~ /^\s*#/; next if $currentline =~ /^\s*#/;
chomp $line; chomp $currentline;
next if $line =~ /^\s*$/; next if $currentline =~ /^\s*$/;
$line =~ s/#.*$//; # Remove Trailing Comments $currentline =~ s/#.*$//; # Remove Trailing Comments
return 1; return 1;
} }
@ -758,8 +761,8 @@ sub load_kernel_modules( ) {
open LSMOD , '-|', 'lsmod' or fatal_error "Can't run lsmod"; open LSMOD , '-|', 'lsmod' or fatal_error "Can't run lsmod";
while ( $line = <LSMOD> ) { while ( $currentline = <LSMOD> ) {
my $module = ( split( /\s+/, $line, 2 ) )[0]; my $module = ( split( /\s+/, $currentline, 2 ) )[0];
$loadedmodules{$module} = 1 unless $module eq 'Module' $loadedmodules{$module} = 1 unless $module eq 'Module'
} }
@ -770,7 +773,7 @@ sub load_kernel_modules( ) {
my @suffixes = split /\s+/ , $config{MODULE_SUFFIX}; my @suffixes = split /\s+/ , $config{MODULE_SUFFIX};
while ( read_a_line ) { while ( read_a_line ) {
fatal_error "Invalid modules file entry" unless ( $line =~ /^loadmodule\s+([a-zA-Z]\w*)\s*(.*)$/ ); fatal_error "Invalid modules file entry" unless ( $currentline =~ /^loadmodule\s+([a-zA-Z]\w*)\s*(.*)$/ );
my ( $module, $arguments ) = ( $1, $2 ); my ( $module, $arguments ) = ( $1, $2 );
unless ( $loadedmodules{ $module } ) { unless ( $loadedmodules{ $module } ) {
for my $directory ( @moduledirectories ) { for my $directory ( @moduledirectories ) {
@ -911,7 +914,7 @@ sub ensure_config_path() {
$ENV{CONFDIR} = $globals{CONFDIR}; $ENV{CONFDIR} = $globals{CONFDIR};
while ( read_a_line ) { while ( read_a_line ) {
if ( $line =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) { if ( $currentline =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
my ($var, $val) = ($1, $2); my ($var, $val) = ($1, $2);
$config{$var} = ( $val =~ /\"([^\"]*)\"$/ ? $1 : $val ) if exists $config{$var}; $config{$var} = ( $val =~ /\"([^\"]*)\"$/ ? $1 : $val ) if exists $config{$var};
} else { } else {
@ -953,7 +956,7 @@ sub process_shorewall_conf() {
open_file $file; open_file $file;
while ( read_a_line ) { while ( read_a_line ) {
if ( $line =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) { if ( $currentline =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
my ($var, $val) = ($1, $2); my ($var, $val) = ($1, $2);
unless ( exists $config{$var} ) { unless ( exists $config{$var} ) {
warning_message "Unknown configuration option ($var) ignored"; warning_message "Unknown configuration option ($var) ignored";
@ -1000,7 +1003,7 @@ sub get_capabilities( $ ) {
# Otherwise, the first call to read_a_line() below will return false # Otherwise, the first call to read_a_line() below will return false
# #
while ( read_a_line1 ) { while ( read_a_line1 ) {
if ( $line =~ /^([a-zA-Z]\w*)=(.*)$/ ) { if ( $currentline =~ /^([a-zA-Z]\w*)=(.*)$/ ) {
my ($var, $val) = ($1, $2); my ($var, $val) = ($1, $2);
unless ( exists $capabilities{$var} ) { unless ( exists $capabilities{$var} ) {
warning_message "Unknown capability ($var) ignored"; warning_message "Unknown capability ($var) ignored";

2
Shorewall-perl/Shorewall/Hosts.pm
View File

@ -132,7 +132,7 @@ sub validate_hosts_file()
add_group_to_zone( $zone, $type , $interface, [ split( ',', $hosts ) ] , $optionsref); add_group_to_zone( $zone, $type , $interface, [ split( ',', $hosts ) ] , $optionsref);
progress_message " Host \"$line\" validated"; progress_message " Host \"$currentline\" validated";
} }
$capabilities{POLICY_MATCH} = '' unless $ipsec || haveipseczones; $capabilities{POLICY_MATCH} = '' unless $ipsec || haveipseczones;

2
Shorewall-perl/Shorewall/Interfaces.pm
View File

@ -364,7 +364,7 @@ sub validate_interfaces_file( $ )
$interfaces{$interface}{zone} = $zone; #Must follow the call to add_group_to_zone() $interfaces{$interface}{zone} = $zone; #Must follow the call to add_group_to_zone()
progress_message " Interface \"$line\" Validated"; progress_message " Interface \"$currentline\" Validated";
} }

4
Shorewall-perl/Shorewall/Nat.pm
View File

@ -275,7 +275,7 @@ sub setup_one_masq($$$$$$$)
} }
} }
progress_message " Masq record \"$line\" $done"; progress_message " Masq record \"$currentline\" $done";
} }
@ -387,7 +387,7 @@ sub do_one_nat( $$$$$ )
} }
} }
progress_message " NAT entry \"$line\" $done"; progress_message " NAT entry \"$currentline\" $done";
} }
# #

4
Shorewall-perl/Shorewall/Providers.pm
View File

@ -351,7 +351,7 @@ sub setup_providers() {
"run_ip rule add $source $dest $priority table $provider", "run_ip rule add $source $dest $priority table $provider",
"echo \"qt ip rule del $source $dest $priority\" >> \${VARDIR}/undo_routing" "echo \"qt ip rule del $source $dest $priority\" >> \${VARDIR}/undo_routing"
); );
progress_message " Routing rule \"$line\" $done"; progress_message " Routing rule \"$currentline\" $done";
} }
# #
# Setup_Providers() Starts Here.... # Setup_Providers() Starts Here....
@ -397,7 +397,7 @@ sub setup_providers() {
$providers++; $providers++;
progress_message " Provider \"$line\" $done"; progress_message " Provider \"$currentline\" $done";
} }

4
Shorewall-perl/Shorewall/Proxyarp.pm
View File

@ -153,8 +153,8 @@ sub setup_proxy_arp() {
} }
sub dump_proxy_arp() { sub dump_proxy_arp() {
for $line ( @proxyarp ) { for ( @proxyarp ) {
emit_unindented $line; emit_unindented $_;
} }
} }

10
Shorewall-perl/Shorewall/Rules.pm
View File

@ -347,7 +347,7 @@ sub setup_blacklist() {
$disposition , $disposition ,
'' ); '' );
progress_message " \"$line\" added to blacklist"; progress_message " \"$currentline\" added to blacklist";
} }
} }
@ -773,7 +773,7 @@ sub setup_mac_lists( $ ) {
add_rule $chainref , "$mac-j $targetref->{target}"; add_rule $chainref , "$mac-j $targetref->{target}";
} }
progress_message " Maclist entry \"$line\" $done"; progress_message " Maclist entry \"$currentline\" $done";
} }
} }
@ -884,7 +884,7 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
process_rule1 $mtarget, $msource, $mdest, $mproto, $mports, $msports, $origdest, $mrate, $muser, $mark, $wildcard; process_rule1 $mtarget, $msource, $mdest, $mproto, $mports, $msports, $origdest, $mrate, $muser, $mark, $wildcard;
progress_message " Rule \"$line\" $done"; progress_message " Rule \"$currentline\" $done";
} }
pop_open; pop_open;
@ -1209,7 +1209,7 @@ sub process_rule ( $$$$$$$$$$ ) {
my $intrazone = 0; my $intrazone = 0;
my $includesrcfw = 1; my $includesrcfw = 1;
my $includedstfw = 1; my $includedstfw = 1;
my $thisline = $line; my $thisline = $currentline;
# #
# Section Names are optional so once we get to an actual rule, we need to be sure that # Section Names are optional so once we get to an actual rule, we need to be sure that
# we close off any missing sections. # we close off any missing sections.
@ -1332,7 +1332,7 @@ sub process_rules() {
$section = $source; $section = $source;
} else { } else {
if ( "\L$source" =~ /^none(:.*)?$/ || "\L$dest" =~ /^none(:.*)?$/ ) { if ( "\L$source" =~ /^none(:.*)?$/ || "\L$dest" =~ /^none(:.*)?$/ ) {
progress_message "Rule \"$line\" ignored." progress_message "Rule \"$currentline\" ignored."
} else { } else {
process_rule $target, $source, $dest, $proto, $ports, $sports, $origdest, $ratelimit, $user, $mark; process_rule $target, $source, $dest, $proto, $ports, $sports, $origdest, $ratelimit, $user, $mark;
} }

2
Shorewall-perl/Shorewall/Tc.pm
View File

@ -287,7 +287,7 @@ sub process_tc_rule( $$$$$$$$$$ ) {
fatal_error "Class Id $original_mark is not associated with device $result" if $classid && $device ne $result; fatal_error "Class Id $original_mark is not associated with device $result" if $classid && $device ne $result;
} }
progress_message " TC Rule \"$line\" $done"; progress_message " TC Rule \"$currentline\" $done";
} }

2
Shorewall-perl/Shorewall/Tunnels.pm
View File

@ -261,7 +261,7 @@ sub setup_tunnels() {
$tunnelref->{function}->( $inchainref, $outchainref, @{$tunnelref->{params}} ); $tunnelref->{function}->( $inchainref, $outchainref, @{$tunnelref->{params}} );
progress_message " Tunnel \"$line\" $done"; progress_message " Tunnel \"$currentline\" $done";
} }
my $first_entry = 1; my $first_entry = 1;