From 66ec1cc9a13c3d4212b98f0db5655381df60f311 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 25 Jul 2007 23:39:20 +0000
Subject: [PATCH] More log level zero fixes

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6962 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Actions.pm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Actions.pm b/Shorewall-perl/Shorewall/Actions.pm
index 59e113657..bd5d0b6e4 100644
--- a/Shorewall-perl/Shorewall/Actions.pm
+++ b/Shorewall-perl/Shorewall/Actions.pm
@@ -657,7 +657,7 @@ sub process_actions3 () {
 	my ($chainref, $level, $tag) = @_;
 
 	if ( $capabilities{ADDRTYPE} ) {
-	    if ( $level ) {
+	    if ( defined $level && level ne '' ) {
 		log_rule_limit $level, $chainref, 'dropBcast' , 'DROP', '', $tag, 'add', ' -m addrtype --dst-type BROADCAST';
 		log_rule_limit $level, $chainref, 'dropBcast' , 'DROP', '', $tag, 'add', ' -d 224.0.0.0/4';
 	    }
@@ -666,12 +666,12 @@ sub process_actions3 () {
 	} else {
 	    add_command $chainref, 'for address in $ALL_BCASTS; do';
 	    push_cmd_mode $chainref;
-	    log_rule_limit $level, $chainref, 'dropBcast' , 'DROP', '', $tag, 'add', ' -d $address' if $level;
+	    log_rule_limit $level, $chainref, 'dropBcast' , 'DROP', '', $tag, 'add', ' -d $address' if defined level && $level ne '';
 	    add_rule $chainref, '-d $address -j DROP';
 	    pop_cmd_mode $chainref;
 	    add_command $chainref, 'done';
 
-	    log_rule_limit $level, $chainref, 'dropBcast' , 'DROP', '', $tag, 'add', ' -d 224.0.0.0/4' if $level;
+	    log_rule_limit $level, $chainref, 'dropBcast' , 'DROP', '', $tag, 'add', ' -d 224.0.0.0/4' if defined level && $level ne '';
 	}   
 
 	add_rule $chainref, '-d 224.0.0.0/4 -j DROP';
@@ -681,7 +681,7 @@ sub process_actions3 () {
 	my ($chainref, $level, $tag) = @_;
 
 	if ( $capabilities{ADDRTYPE} ) {
-	    if ( $level ) {
+	    if ( defined $level && level ne '' ) {
 		log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -m addrtype --dst-type BROADCAST';
 		log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -d 224.0.0.0/4';
 	    }
@@ -690,12 +690,12 @@ sub process_actions3 () {
 	} else {
 	    add_command $chainref, 'for address in $ALL_BCASTS; do';
 	    push_cmd_mode $chainref;
-	    log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -d $address' if $level;
+	    log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -d $address' if defined level && $level ne '';
 	    add_rule $chainref, '-d $address -j ACCEPT';
 	    pop_cmd_mode $chainref;
 	    add_command $chainref, 'done';
 
-	    log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -d 224.0.0.0/4' if $level;
+	    log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -d 224.0.0.0/4' if defined level && $level ne '';
 	}
 	    add_rule $chainref, '-d 224.0.0.0/4 -j ACCEPT';
     }
@@ -703,28 +703,28 @@ sub process_actions3 () {
     sub dropNotSyn ( $$$ ) {
 	my ($chainref, $level, $tag) = @_;
 
-	log_rule_limit $level, $chainref, 'dropNotSyn' , 'DROP', '', $tag, 'add', '-p tcp ! --syn ' if $level;
+	log_rule_limit $level, $chainref, 'dropNotSyn' , 'DROP', '', $tag, 'add', '-p tcp ! --syn ' if defined level && $level ne '';
 	add_rule $chainref , '-p tcp ! --syn -j DROP';
     }
 
     sub rejNotSyn ( $$$ ) {
 	my ($chainref, $level, $tag) = @_;
 
-	log_rule_limit $level, $chainref, 'rejNotSyn' , 'REJECT', '', $tag, 'add', '-p tcp ! --syn ' if $level;
+	log_rule_limit $level, $chainref, 'rejNotSyn' , 'REJECT', '', $tag, 'add', '-p tcp ! --syn ' if defined level && $level ne '';
 	add_rule $chainref , '-p tcp ! --syn -j REJECT --reject-with tcp-reset';
     }
 
     sub dropInvalid ( $$$ ) {
 	my ($chainref, $level, $tag) = @_;
 
-	log_rule_limit $level, $chainref, 'dropInvalid' , 'DROP', '', $tag, 'add', '-m state --state INVALID ' if $level;
+	log_rule_limit $level, $chainref, 'dropInvalid' , 'DROP', '', $tag, 'add', '-m state --state INVALID ' if defined level && $level ne '';
 	add_rule $chainref , '-m state --state INVALID -j DROP';
     }
 
     sub allowInvalid ( $$$ ) {
 	my ($chainref, $level, $tag) = @_;
 
-	log_rule_limit $level, $chainref, 'allowInvalid' , 'ACCEPT', '', $tag, 'add', '-m state --state INVALID ' if $level;
+	log_rule_limit $level, $chainref, 'allowInvalid' , 'ACCEPT', '', $tag, 'add', '-m state --state INVALID ' if defined level && $level ne '';
 	add_rule $chainref , '-m state --state INVALID -j ACCEPT';
     }
 
@@ -734,7 +734,7 @@ sub process_actions3 () {
     sub allowinUPnP ( $$$ ) {
 	my ($chainref, $level, $tag) = @_;
 
-	if ( $level ) {
+	if ( defined level && $level ne '' ) {
 	    log_rule_limit $level, $chainref, 'allowinUPnP' , 'ACCEPT', '', $tag, 'add', '-p udp --dport 1900 ';
 	    log_rule_limit $level, $chainref, 'allowinUPnP' , 'ACCEPT', '', $tag, 'add', '-p tcp --dport 49152 ';
 	}
@@ -762,7 +762,7 @@ sub process_actions3 () {
 
 	add_rule $chainref, "-m recent --name $set --set";
 
-	if ( $level ) {
+	if ( defined level && $level ne '' ) {
 	    my $xchainref = new_chain 'filter' , "$chainref->{name}%";
 	    log_rule_limit $level, $xchainref, $tag[0], 'DROP', '', '', 'add', '';
 	    add_rule $xchainref, '-j DROP';