From b3caaaf707088350312f4db4ea4a4092a5e1787a Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 8 Feb 2013 06:39:16 -0800
Subject: [PATCH] Pass the state name to perl_action_helper() from the state
 actions.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/action.Established | 2 +-
 Shorewall/action.Invalid     | 2 +-
 Shorewall/action.New         | 2 +-
 Shorewall/action.Related     | 2 +-
 Shorewall/action.Untracked   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall/action.Established b/Shorewall/action.Established
index 47ff0d5ac..257a9e243 100644
--- a/Shorewall/action.Established
+++ b/Shorewall/action.Established
@@ -41,7 +41,7 @@ use Shorewall::Rules;
 my ( $action ) = get_action_params( 1 );
 
 if ( my $check = check_state( 'ESTABLISHED' ) ) {
-    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} ESTABLISHED" : '', 1 );
+    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} ESTABLISHED" : '', 'ESTABLISHED' );
 }
 
 1;
diff --git a/Shorewall/action.Invalid b/Shorewall/action.Invalid
index 52595fe5c..df22a6464 100644
--- a/Shorewall/action.Invalid
+++ b/Shorewall/action.Invalid
@@ -46,7 +46,7 @@ if ( supplied $audit ) {
 }
 
 if ( my $check = check_state( 'INVALID' ) ) {
-    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} INVALID" : '' , 1 );
+    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} INVALID" : '' , 'INVALID' );
 }
 
 1;
diff --git a/Shorewall/action.New b/Shorewall/action.New
index bbfcec3fb..490cef099 100644
--- a/Shorewall/action.New
+++ b/Shorewall/action.New
@@ -41,7 +41,7 @@ use Shorewall::Rules;
 my ( $action ) = get_action_params( 1 );
 
 if ( my $check = check_state( 'NEW' ) ) {
-    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} NEW" : '' );
+    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} NEW" : '' , 'NEW' );
 }
 
 allow_optimize( get_action_chain );
diff --git a/Shorewall/action.Related b/Shorewall/action.Related
index 8e0d666fe..7e7a83582 100644
--- a/Shorewall/action.Related
+++ b/Shorewall/action.Related
@@ -42,7 +42,7 @@ use Shorewall::Rules;
 my ( $action ) = get_action_params( 1 );
 
 if ( my $check = check_state( 'RELATED' ) ) {
-    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} RELATED" : '', 1 );
+    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} RELATED" : '', 'RELATED' );
 }
 
 1;
diff --git a/Shorewall/action.Untracked b/Shorewall/action.Untracked
index eb71af255..7135d0c33 100644
--- a/Shorewall/action.Untracked
+++ b/Shorewall/action.Untracked
@@ -41,7 +41,7 @@ use Shorewall::Rules;
 my ( $action ) = get_action_params( 1 );
 
 if ( my $check = check_state( 'UNTRACKED' ) ) {
-    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} UNTRACKED" : '' , 1 );
+    perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} UNTRACKED" : '' , 'UNTRACKED' );
 }
 
 1;