From: Michel Loiseleur <michel@loiseleur.com>
Date: Mon, 20 Aug 2012 18:53:51 +0000 (+0200)
Subject: Clarify zone names
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=1b6a0a59ecf373b94fafbfb5466f33ef3438bbd2

Clarify zone names

It transforms zones files like this:
#ZONE                          TYPE       OPTIONS
$FW                            firewall
$ZVMBR0                        ipv4
$ZVMBR0EXT:$ZVMBR0             bport
$ZVMBR0VM100:$ZVMBR0          bport
$ZVMBR0VM101:$ZVMBR0          bport

into this:
#ZONE                          TYPE       OPTIONS
$FW                            firewall
$VMBR0                         ipv4
$VMBR0_EXT:$VMBR0              bport
$VMBR0_VM100:$VMBR0            bport
$VMBR0_VM101:$VMBR0            bport

Signed-off-by: Michel Loiseleur <michel@loiseleur.com>
---

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index 8767008..6a3f225 100644
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -214,11 +214,11 @@ my $compile_shorewall = sub {
     $register_bridge = sub {
 	my ($bridge, $vlan) = @_;
 
-	my $zone =  'z' . $bridge;
+	my $zone =  $bridge;
 
 	return $zone if $zoneinfo->{$zone};
 
-	my $ext_zone = "z${bridge}ext";
+	my $ext_zone = "${bridge}_ext";
 
 	$zoneinfo->{$zone} = {
 	    type => 'bridge',
@@ -249,7 +249,7 @@ my $compile_shorewall = sub {
 	my ($bridge, $vlan, $vmzone, $tap) = @_;
 
 	my $bridge_zone = &$register_bridge($bridge, $vlan);
-	my $zone = $bridge_zone . $vmzone;
+	my $zone = $bridge_zone . '_' . $vmzone;
 
 	if (!$zoneinfo->{$zone}) {
 	    $zoneinfo->{$zone} = {