From b591110fefeaa47f1c26cab889683722e2d2c9f1 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 7 Jun 2010 09:11:33 -0800
Subject: [PATCH] Much cleaner implementation of save_dynamic_chains()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Compiler.pm | 54 +++++++++++++---------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index 3b86ec9f8..fa087655b 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -309,44 +309,40 @@ sub generate_script_2() {
 
 sub save_dynamic_chains() {
 
+    my $tool = $family == F_IPV4 ? '${IPTABLES}-save' : '${IP6TABLES}-save';
+
     emit ( 'if [ "$COMMAND" = restart -o "$COMMAND" = restore ]; then' );
     push_indent;
 
-    if ( $family == F_IPV4 ) {
-	emit( 'local iptables_save' ,
-	      'iptables_save=${IPTABLES}-save' );
-    } else {
-	emit( 'local iptables_save' ,
-	      'iptables_save=${IP6TABLES}-save' );
-    }
+emit <<"EOF";
+if chain_exists 'UPnP -t nat'; then
+    $tool -t nat | grep '^-A UPnP ' > \${VARDIR}/.UPnP
+else
+    rm -f \${VARDIR}/.UPnP
+fi
 
-    emit ( q(if chain_exists "UPnP -t nat"; then) ,
-	   q(    $iptables_save -t nat | grep '^-A UPnP ' > ${VARDIR}/.UPnP) ,
-	   q(else) ,
-	   q(    rm -f ${VARDIR}/UPnP) ,
-	   q(fi) ,
-	   '' ,
-	   q(if chain_exists forwardUPnP; then) ,
-	   q(    $iptables_save -t filter | grep '^-A forwardUPnP ' > ${VARDIR}/.forwardUPnP) ,
-	   q(else) ,
-	   q(    rm -f ${VARDIR}/forwardUPnP) ,
-	   q(fi) ,
-	   '' ,
-	   q(if chain_exists dynamic; then) ,
-	   q(    $iptables_save -t filter | grep '^-A dynamic ' > ${VARDIR}/.dynamic) ,
-	   q(else) ,
-	   q(    rm -f ${VARDIR}/dynamic) ,
-	   q(fi)
-	 );
+if chain_exists forwardUPnP; then
+    $tool -t filter | grep '^-A forwardUPnP ' > \${VARDIR}/.forwardUPnP
+else
+    rm -f \${VARDIR}/.forwardUPnP
+fi
+
+if chain_exists dynamic; then
+    $tool -t filter | grep '^-A dynamic ' > \${VARDIR}/.dynamic
+else
+    rm -f \${VARDIR}/.dynamic
+fi
+EOF
 
     pop_indent;
     emit ( 'else' );
     push_indent;
-	
-    emit (  'rm -f ${VARDIR}/UPnP' );
-    emit (  'rm -f ${VARDIR}/forwardUPnP' );
-    emit (  'rm -f ${VARDIR}/dynamic' );
 
+emit <<'EOF';
+rm -f ${VARDIR}/.UPnP
+rm -f ${VARDIR}/.forwardUPnP
+rm -f ${VARDIR}/.dynamic
+EOF
     pop_indent;
 
     emit ( 'fi' ,