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 876700867bbf61112887fde8fd9dd2ef45583828..6a3f225dbc69e7ee523c17833cd33bdb337186ff 100644 (file)
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -214,11 +214,11 @@ my $compile_shorewall = sub {
     $register_bridge = sub {
        my ($bridge, $vlan) = @_;
 
     $register_bridge = sub {
        my ($bridge, $vlan) = @_;
 

-       my $zone =  'z' . $bridge;
+       my $zone =  $bridge;

 
        return $zone if $zoneinfo->{$zone};
 
 
        return $zone if $zoneinfo->{$zone};
 

-       my $ext_zone = "z${bridge}ext";
+       my $ext_zone = "${bridge}_ext";

 
        $zoneinfo->{$zone} = {
            type => 'bridge',
 
        $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 ($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} = {
 
        if (!$zoneinfo->{$zone}) {
            $zoneinfo->{$zone} = {