extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate the %inlines table

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-03-14 10:47:18 -07:00
parent 95da427ea8
commit c631173310
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,10 +186,6 @@ our %active;
# #
our %actions; our %actions;
# #
# Inline Action Table
#
our %inlines;
#
# Contains an entry for each used <action>:<level>:[<tag>]:[<calling chain>]:[<params>] that maps to the associated chain. # Contains an entry for each used <action>:<level>:[<tag>]:[<calling chain>]:[<params>] that maps to the associated chain.
# See normalize_action(). # See normalize_action().
# #
@ -353,10 +349,6 @@ sub initialize( $ ) {
# #
%actions = (); %actions = ();
# #
# Inline Actions -- value is file.
#
%inlines = ();
#
# Action variants actually used. Key is <action>:<loglevel>:<tag>:<params>; value is corresponding chain name # Action variants actually used. Key is <action>:<loglevel>:<tag>:<params>; value is corresponding chain name
# #
%usedactions = (); %usedactions = ();
@ -536,7 +528,7 @@ sub process_default_action( $$$$ ) {
} }
$default = 'none'; $default = 'none';
} elsif ( $actions{$def} ) { } elsif ( ( $targets{$def} || 0 ) == ACTION ) {
$default = supplied $param ? normalize_action( $def, $level, $param ) : $default = supplied $param ? normalize_action( $def, $level, $param ) :
$level eq 'none' ? normalize_action_name $def : $level eq 'none' ? normalize_action_name $def :
normalize_action( $def, $level, '' ); normalize_action( $def, $level, '' );
@ -1321,13 +1313,13 @@ sub external_name( $ ) {
# #
# Define an Action # Define an Action
# #
sub new_action( $$$ ) { sub new_action( $$$$ ) {
my ( $action , $type, $options ) = @_; my ( $action , $type, $options , $actionfile ) = @_;
fatal_error "Invalid action name($action)" if reserved_name( $action ); fatal_error "Invalid action name($action)" if reserved_name( $action );
$actions{$action} = { actchain => '' , options => $options } if $type & ACTION; $actions{$action} = { file => $actionfile, actchain => '' , type => $type, options => $options };
$targets{$action} = $type; $targets{$action} = $type;
} }
@ -2036,7 +2028,7 @@ sub process_actions() {
# #
# Add built-in actions to the target table and create those actions # Add built-in actions to the target table and create those actions
# #
$targets{$_} = new_action( $_ , ACTION + BUILTIN, NOINLINE_OPT ) for @builtins; $targets{$_} = new_action( $_ , ACTION + BUILTIN, NOINLINE_OPT, '' ) for @builtins;
for my $file ( qw/actions.std actions/ ) { for my $file ( qw/actions.std actions/ ) {
open_file( $file, 2 ); open_file( $file, 2 );
@ -2111,13 +2103,11 @@ sub process_actions() {
$type |= MANGLE_TABLE if $opts & MANGLE_OPT; $type |= MANGLE_TABLE if $opts & MANGLE_OPT;
new_action ( $action, $type, $opts );
my $actionfile = find_file( "action.$action" ); my $actionfile = find_file( "action.$action" );
fatal_error "Missing Action File ($actionfile)" unless -f $actionfile; fatal_error "Missing Action File ($actionfile)" unless -f $actionfile;
$inlines{$action} = { file => $actionfile, options => $opts } if $type & INLINE; new_action ( $action, $type, $opts, $actionfile );
} }
} }
} }
@ -2329,8 +2319,8 @@ sub process_inline ($$$$$$$$$$$$$$$$$$$$$$) {
$chainref->{name} , $chainref->{name} ,
); );
my $inlinefile = $inlines{$inline}{file}; my $inlinefile = $actions{$inline}{file};
my $options = $inlines{$inline}{options}; my $options = $actions{$inline}{options};
my $nolog = $options & NOLOG_OPT; my $nolog = $options & NOLOG_OPT;
setup_audit_action( $inline ) if $options & AUDIT_OPT; setup_audit_action( $inline ) if $options & AUDIT_OPT;
@ -3309,7 +3299,11 @@ sub perl_action_helper($$;$$) {
} }
} }
if ( my $ref = $inlines{$action} ) { my $ref = $actions{$action};
assert( $ref, $action );
if ( $ref->{type} & INLINE ) {
$result = &process_rule( $chainref, $result = &process_rule( $chainref,
$matches, $matches,
$matches1, $matches1,
@ -3317,8 +3311,6 @@ sub perl_action_helper($$;$$) {
'', # CurrentParam '', # CurrentParam
@columns ); @columns );
} else { } else {
assert $actions{$action};
$result = process_rule( $chainref, $result = process_rule( $chainref,
$matches, $matches,
$matches1, $matches1,
@ -3370,7 +3362,11 @@ sub perl_action_tcp_helper($$) {
# #
# For other protos, a 'no rule generated' warning will be issued # For other protos, a 'no rule generated' warning will be issued
# #
if ( my $ref = $inlines{$action} ) { my $ref = $actions{$action};
assert( $ref, $action );
if ( $ref->{type} & INLINE ) {
$result = &process_rule( $chainref, $result = &process_rule( $chainref,
$proto, $proto,
'', '',
@ -3720,7 +3716,7 @@ sub process_mangle_inline( $$$$$$$$$$$$$$$$$$$ ) {
'' , '' ,
$chainref->{name} ); $chainref->{name} );
my $inlinefile = $inlines{$inline}{file}; my $inlinefile = $actions{$inline}{file};
progress_message "..Expanding inline action $inlinefile..."; progress_message "..Expanding inline action $inlinefile...";