From 2a910ebddf20ac14d0c8740c4a54fbac0a4c158f Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 16 Nov 2009 12:43:44 -0800
Subject: [PATCH] Suppress redundant tests for provider availability in route
 rules processing

---
 Shorewall/Perl/Shorewall/Providers.pm | 27 ++++++++++++++++++++++++---
 Shorewall/changelog.txt               |  2 ++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm
index 0db05c993..6acb9e2b0 100644
--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@@ -534,9 +534,19 @@ sub add_a_provider( ) {
     progress_message "   Provider \"$currentline\" $done";
 }
 
+sub finish_if_statement() {
+    if ( our $last_base ) {
+	pop_indent;
+	emit ( "fi\n" );
+	$last_base = '';
+    }
+}
+
 sub add_an_rtrule( ) {
     my ( $source, $dest, $provider, $priority ) = split_line 4, 4, 'route_rules file';
 
+    our $last_base;
+
     unless ( $providers{$provider} ) {
 	my $found = 0;
 
@@ -601,14 +611,22 @@ sub add_an_rtrule( ) {
 
     if ( $optional ) {
 	my $base = uc chain_base( $providers{$provider}{physical} );
-	emit ( '', qq(if [ -n "\$${base}_IS_USABLE" ]; then) );
-	push_indent;
+
+	finish_if_statement if $base ne $last_base;
+
+	unless ( $last_base ) {
+	    emit ( '', qq(if [ -n "\$${base}_IS_USABLE" ]; then) );
+	    push_indent;
+	    $last_base = $base;
+	}
+    } else {
+	finish_if_statement;
     }
 
     emit ( "run_ip rule add $source $dest $priority table $number",
 	   "echo \"qt \$IP -$family rule del $source $dest $priority\" >> \${VARDIR}/undo_routing" );
 
-    pop_indent, emit ( "fi\n" ) if $optional;
+    finish_if_statement if $optional && $config{DELETE_THEN_ADD};
 
     progress_message "   Routing rule \"$currentline\" $done";
 }
@@ -743,12 +761,15 @@ sub setup_providers() {
 	my $fn = open_file 'route_rules';
 
 	if ( $fn ) {
+	    our $last_base = '';
 
 	    first_entry "$doing $fn...";
 
 	    emit '';
 
 	    add_an_rtrule while read_a_line;
+
+	    finish_if_statement;
 	}
 
 	setup_null_routing if $config{NULL_ROUTE_RFC1918};
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index d5cc1654f..cd5cb3a13 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -18,6 +18,8 @@ Changes in Shorewall 4.4.4
 
 9)  Fix route_rule suppression for down provider.
 
+10) Suppress redundant tests for provider availability in route rules processing.
+
 Changes in Shorewall 4.4.3
 
 1)  Move Debian INITLOG initialization to /etc/default/shorewall