cleanups - use better names

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 440d12b98252aa6a0580b906627ab95a64545cf5..64345924650b94e7ce70ae8540e59a9d3cf3b167 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1413,18 +1413,18 @@ sub read_local_vm_config {
     return $vmdata;
 };
 
     return $vmdata;
 };
 

-sub read_vm_firewall_rules {
+sub read_vm_firewall_configs {

     my ($vmdata) = @_;
     my ($vmdata) = @_;

-    my $rules = {};
+    my $vmfw_configs = {};

     foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) {
        my $filename = "/etc/pve/firewall/$vmid.fw";
        my $fh = IO::File->new($filename, O_RDONLY);
        next if !$fh;
 
     foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) {
        my $filename = "/etc/pve/firewall/$vmid.fw";
        my $fh = IO::File->new($filename, O_RDONLY);
        next if !$fh;
 

-       $rules->{$vmid} = parse_vm_fw_rules($filename, $fh);
+       $vmfw_configs->{$vmid} = parse_vm_fw_rules($filename, $fh);

     }
 
     }
 

-    return $rules;
+    return $vmfw_configs;

 }
 
 sub get_option_log_level {
 }
 
 sub get_option_log_level {


@@ -1508,7 +1508,7 @@ sub read_pvefw_status {
 
 sub compile {
     my $vmdata = read_local_vm_config();
 
 sub compile {
     my $vmdata = read_local_vm_config();

-    my $rules = read_vm_firewall_rules($vmdata);
+    my $vmfw_configs = read_vm_firewall_configs($vmdata);

 
     my $groups_conf = {};
     my $filename = "/etc/pve/firewall/groups.fw";
 
     my $groups_conf = {};
     my $filename = "/etc/pve/firewall/groups.fw";


@@ -1545,7 +1545,7 @@ sub compile {
     # generate firewall rules for QEMU VMs
     foreach my $vmid (keys %{$vmdata->{qemu}}) {
        my $conf = $vmdata->{qemu}->{$vmid};
     # generate firewall rules for QEMU VMs
     foreach my $vmid (keys %{$vmdata->{qemu}}) {
        my $conf = $vmdata->{qemu}->{$vmid};

-       my $vmfw_conf = $rules->{$vmid};
+       my $vmfw_conf = $vmfw_configs->{$vmid};

        next if !$vmfw_conf;
        next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);
 
        next if !$vmfw_conf;
        next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);