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

Streamline PERL in action.Drop and action.Reject

Browse Source 
- Rename read_action_param => get_action_params
- Allow it to accept a list of indexes and to return a list

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-22 06:53:15 -07:00
parent bbf853bd1d
commit b43bee2c62
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ our @EXPORT = qw(
progress_message2 progress_message2
progress_message3 progress_message3
supplied supplied
read_action_param get_action_params
set_action_param set_action_param
); );
@ -1840,11 +1840,15 @@ sub default_action_params {
} }
} }
sub read_action_param( $ ) { sub get_action_params {
my $i = shift; my @values;
fatal_error "Parameter numbers must be numeric" unless $i =~ /^\d+$/; for ( @_ ) {
$actparms{$i}; fatal_error "Parameter numbers must be numeric" unless $_ =~ /^\d+$/;
push @values, $actparms{$_};
}
@values;
} }
sub set_action_param( $$ ) { sub set_action_param( $$ ) {

4
Shorewall/action.Drop
View File

@ -35,11 +35,9 @@ FORMAT 2
BEGIN PERL BEGIN PERL
use Shorewall::Config; use Shorewall::Config;
my $p1 = read_action_param(1); my ($p1, $p2, $p3 ) = get_action_params(1, 2, 3);
if ( defined $p1 && $p1 eq 'audit' ) { if ( defined $p1 && $p1 eq 'audit' ) {
my ( $p2, $p3 ) = ( read_action_param(2) , read_action_param(3) );
set_action_param( 2, 'A_REJECT') unless defined $p2; set_action_param( 2, 'A_REJECT') unless defined $p2;
set_action_param( 3, 'A_DROP') unless defined $p3; set_action_param( 3, 'A_DROP') unless defined $p3;
}; };

4
Shorewall/action.Reject
View File

@ -31,11 +31,9 @@ FORMAT 2
BEGIN PERL BEGIN PERL
use Shorewall::Config; use Shorewall::Config;
my $p1 = read_action_param(1); my ( $p1, $p2, $p3 ) = get_action_params(1, 2, 3);
if ( defined $p1 && $p1 eq 'audit' ) { if ( defined $p1 && $p1 eq 'audit' ) {
my ( $p2, $p3 ) = ( read_action_param(2) , read_action_param(3) );
set_action_param( 2, 'A_REJECT') unless defined $p2; set_action_param( 2, 'A_REJECT') unless defined $p2;
set_action_param( 3, 'A_REJECT') unless defined $p3; set_action_param( 3, 'A_REJECT') unless defined $p3;
}; };