From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 5 Mar 2014 06:30:11 +0000 (+0100)
Subject: cleanups - use better names
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=6fc63ffdf678dc24fd70cae47d5caf5175b9cf26;ds=inline

cleanups - use better names
---

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 440d12b..6434592 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1413,18 +1413,18 @@ sub read_local_vm_config {
     return $vmdata;
 };
 
-sub read_vm_firewall_rules {
+sub read_vm_firewall_configs {
     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;
 
-	$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 {
@@ -1508,7 +1508,7 @@ sub read_pvefw_status {
 
 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";
@@ -1545,7 +1545,7 @@ sub compile {
     # 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);