From 301bce5d349d6f6c66ddcdfb7417919fc6a0621b Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 8 Mar 2016 09:27:43 -0800
Subject: [PATCH] Clean up mangle actions

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Rules.pm | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index 14d5b8add..232a7ea52 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -4322,23 +4322,19 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 	minparams         => 0 ,
 	maxparams         => 16 ,
 	function          => sub() {
+	    fatal_error( qq(Action $cmd may not be used in the mangle file) ) unless $actiontype & MANGLE_TABLE;
 	    fatal_error q('$FW' may not be specified within an action body) if $chainref;
 	    #
 	    # Create the action:level:tag:param tuple.
 	    #
 	    my $normalized_target = normalize_action( $cmd, '', $params );
-
 	    fatal_error( "Action $cmd invoked Recursively (" .  join( '->', map( external_name( $_ ), @actionstack , $normalized_target ) ) . ')' ) if $active{$cmd};
 
 	    my $ref = use_action( 'mangle', $normalized_target );
 
 	    if ( $ref ) {
 		#
-		# First reference to this tuple
-		#
-		my $savestatematch = $statematch;
-		#
-		# process_action may modify both $normalized_target and $ref!!!
+		# First reference to this tuple - process_action may modify both $normalized_target and $ref!!!
 		#
 		process_action( $normalized_target, $ref, $chainnames{$chain} );
 		#
@@ -4359,8 +4355,11 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
     # Function Body
     #
     if ( $inaction ) {
-	( $inaction , undef ) = split( /:/, $chainref->{name}, 2 ) if $chainref->{action};
-	$chainnames{$chain = ACTIONCHAIN} = $chainref->{name};
+	assert( $chainref->{action} );
+	#
+	# Set chain type
+	#
+	$chain = ACTIONCHAIN;
     }
 
     ( $cmd, $designator ) = split_action( $action );
@@ -4374,7 +4373,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
 
     ( $cmd , $params ) = get_target_param1( $cmd );
 
-    $actiontype = $builtin_target{$cmd} || $targets{$cmd};
+    $actiontype = $builtin_target{$cmd} || $targets{$cmd} || 0;
 
     $commandref = $commands{$cmd};
 
@@ -4451,9 +4450,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
     #
     # Call the command's processing function
     #
-    my $function = $commandref->{function};
-
-    $function->();
+    $commandref->{function}->();
 
     unless ( $done ) {
 	$chain ||= $designator;