diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index f5921c03f..1c5f68369 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -98,9 +98,9 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script close_file push_open pop_open - push_params - pop_params - default_params + push_action_params + pop_action_params + default_action_params read_a_line validate_level which @@ -1789,7 +1789,7 @@ sub embedded_perl( $ ) { # # Push/pop action params # -sub push_params( $ ) { +sub push_action_params( $ ) { my @params = split /,/, $_[0]; my $oldparams = \%actparms; @@ -1804,12 +1804,12 @@ sub push_params( $ ) { $oldparams; } -sub pop_params( $ ) { +sub pop_action_params( $ ) { my $oldparms = shift; %actparms = %$oldparms; } -sub default_params { +sub default_action_params { my $val; for ( my $i = 1; 1; $i++ ) { diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 9f8900349..98dc73202 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -1450,7 +1450,7 @@ sub process_action( $) { push_open $actionfile; - my $oldparms = push_params( $param ); + my $oldparms = push_action_params( $param ); $active{$wholeaction}++; push @actionstack, $wholeaction; @@ -1478,7 +1478,7 @@ sub process_action( $) { } if ( $format == 2 && $target eq 'DEFAULTS' ) { - default_params( split_list $source, 'defaults' ); + default_action_params( split_list $source, 'defaults' ); next; } @@ -1507,7 +1507,7 @@ sub process_action( $) { pop_open; - pop_params( $oldparms ); + pop_action_params( $oldparms ); } } @@ -1566,7 +1566,7 @@ sub process_macro ( $$$$$$$$$$$$$$$$$ ) { } if ( $format == 2 && $target eq 'DEFAULTS' ) { - default_params( split_list $source, 'defaults' ); + default_action_params( split_list $source, 'defaults' ); next; }