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

Clean up use_policy_action()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-01-17 12:35:12 -08:00
parent 1ee645cd79
commit 4059e9de95
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1935,19 +1935,17 @@ sub use_policy_action( $$ ) {
my $ref = use_action( $normalized_target ); my $ref = use_action( $normalized_target );
if ( $ref ) { if ( $ref ) {
my $result = process_action( $ref, $caller ); if ( my $result = process_action( $ref, $caller ) ) {
if ( $result & PARMSMODIFIED ) { if ( $result & PARMSMODIFIED ) {
delete $usedactions{$ref->{action}}; delete $usedactions{$ref->{action}};
} elsif ( $result & USEDCALLER ) { } else {
# #
# The chain uses @CALLER but doesn't modify the action parameters. # The chain uses @CALLER but doesn't modify the action parameters.
# We need to see if this chain has already called this action # We need to see if this chain has already called this action
# #
my $renormalized_target = insert_caller( $normalized_target, $caller ); my $renormalized_target = insert_caller( $normalized_target, $caller );
my $ref1 = $usedactions{$renormalized_target};
if ( $ref1 ) { if ( my $ref1 = $usedactions{$renormalized_target} ) {
# #
# It has -- use the prior chain # It has -- use the prior chain
# #
@ -1970,6 +1968,7 @@ sub use_policy_action( $$ ) {
# #
delete $usedactions{$normalized_target}; delete $usedactions{$normalized_target};
} }
}
} else { } else {
$ref = $usedactions{$normalized_target}; $ref = $usedactions{$normalized_target};
} }