From 35a686eaa1db1d470559f200664951dfc71c597e Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 19 Sep 2010 08:28:29 -0700
Subject: [PATCH] Add delete_reference() function.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index 43a495ec2..e869b75bb 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -604,6 +604,17 @@ sub add_reference ( $$ ) {
     $toref->{references}{$fromref->{name}}++;
 }
 
+#
+# Delete a previously added reference
+#
+sub delete_reference( $$ ) {
+    my ( $fromref, $to ) = @_;
+
+    my $toref = reftype $to ? $to : $chain_table{$fromref->{table}}{$to};
+
+    delete $toref->{references}{$fromref->{name}} unless --$toref->{references}{$fromref->{name}} > 0;
+}
+
 #
 # Insert a rule into a chain. Arguments are:
 #
@@ -612,7 +623,7 @@ sub add_reference ( $$ ) {
 # In the first function, the rule number is zero-relative. In the second function,
 # the rule number is one-relative. In the first function, if the rule number is < 0, then
 # the rule is a jump to a blacklist chain (blacklst or blackout). The rule will be 
-# inserted at the front of the chain and the chain's 'blacklist' member is incremented.
+# inserted at the front of the chain and the chain's 'blacklist' member incremented.
 #
 sub insert_rule1($$$)
 {
@@ -773,7 +784,7 @@ sub copy_rules( $$ ) {
 
 	assert( $chainb =~ /^black/ );
 
-	delete $tableref->{$chainb}{references}{$name1} unless --$tableref->{$chainb}{references}{$name1} > 0;
+	delete_reference $chain1, $chainb;
 
 	assert( ! --$chain1->{blacklist} );
 	$blacklist1 = 0;
@@ -3744,7 +3755,7 @@ sub promote_blacklist_rules() {
 	    if ( $copied ) {
 		shift @{$chain1ref->{rules}};
 		$chain1ref->{blacklist} = 0;
-		delete $chainbref->{references}{$chain1} unless --$chainbref->{references}{$chain1} > 0;
+		delete_reference $chain1ref, $chainbref;
 		$promoted = 1;
 	    }
 	}