From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 20 Mar 2014 10:49:30 +0000 (+0100)
Subject: use enable instead of disable
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=ea9e5116bc7efb3a5c7c065256ad7627d1d8870e;hp=4ac863a6076f6d6d83efe940c4e52c75b450771b

use enable instead of disable

This make it easier to write the GUI.
---

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 6d715c2..646d1a9 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -765,7 +765,7 @@ sub iptables_rule_exist {
 sub ruleset_generate_cmdstr {
     my ($ruleset, $chain, $rule, $actions, $goto) = @_;
 
-    return if $rule->{disable};
+    return if !$rule->{enable};
 
     my @cmd = ();
 
@@ -998,7 +998,7 @@ sub ruleset_generate_vm_rules {
 
     foreach my $rule (@$rules) {
 	next if $rule->{iface} && $rule->{iface} ne $netid;
-	next if $rule->{disable};
+	next if !$rule->{enable};
 	if ($rule->{type} eq 'group') {
 	    my $group_chain = "GROUP-$rule->{action}-$direction"; 
 	    if(!ruleset_chain_exist($ruleset, $group_chain)){
@@ -1228,7 +1228,9 @@ sub parse_fw_rule {
     my $comment = decode('utf8', $1) if $line =~ s/#\s*(.*?)\s*$//;
 
     # we can disable a rule when prefixed with '|'
-    my $disable = 1 if  $line =~ s/^\|//;
+    my $enable = 1;
+
+    $enable = 0 if $line =~ s/^\|//;
 
     my @data = split(/\s+/, $line);
     my $expected_elements = $need_iface ? 8 : 7;
@@ -1295,7 +1297,7 @@ sub parse_fw_rule {
 
     my $param = {
 	type => $type,
-	disable => $disable,
+	enable => $enable,
 	comment => $comment,
 	action => $action,
 	iface => $iface,