From c659f054912a98d84a00522fe6cb6d1dcd9cefd2 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 17 Dec 2010 20:16:09 -0800
Subject: [PATCH] Make generate_matrix locals more obvious

---
 Shorewall/Perl/Shorewall/Misc.pm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Misc.pm b/Shorewall/Perl/Shorewall/Misc.pm
index 53b497110..61fdc6c88 100644
--- a/Shorewall/Perl/Shorewall/Misc.pm
+++ b/Shorewall/Perl/Shorewall/Misc.pm
@@ -1060,13 +1060,19 @@ sub add_interface_jumps {
 #
 sub generate_matrix() {
     my @interfaces = ( all_interfaces );
+    #
+    # Should this be the real PREROUTING chain?
+    #
     my $preroutingref = ensure_chain 'nat', 'dnat';
-    my $fw = firewall_zone;
+
+    my $fw       = firewall_zone;
+    my @zones    = off_firewall_zones;
+    my @vservers = vserver_zones;
+    
     my $notrackref = $raw_table->{notrack_chain $fw};
     my $state = $config{BLACKLISTNEWONLY} ? $globals{UNTRACKED} ? "-m state --state NEW,INVALID,UNTRACKED " : "$globals{STATEMATCH} NEW,INVALID " : '';
-    my @zones = off_firewall_zones;
-    my @vservers = vserver_zones;
     my $interface_jumps_added = 0;
+
     our %input_jump_added   = ();
     our %output_jump_added  = ();
     our %forward_jump_added = ();