X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=cacfedcf19b936947f3bdbdf50632853c05791a4;hp=83d7c1c3757f621471599b9ffc9a472d9a2bed0d;hb=b1ef6d2e715d6aeaf67d53ca3270f0d247c407d9;hpb=1a301a8d78ec8e25cc5ccebd48b59b1fe1406540

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 83d7c1c..cacfedc 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -40,7 +40,7 @@ sub pve_verify_ipv4_or_cidr {
     my ($cidr, $noerr) = @_;
 
     if ($cidr =~ m!^(?:$IPV4RE)(/(\d+))?$!) {
-	return $cidr if Net::IP->new($cidr); 
+	return $cidr if Net::IP->new($cidr);
 	return undef if $noerr;
 	die Net::IP::Error() . "\n";
     }
@@ -53,24 +53,33 @@ PVE::JSONSchema::register_standard_option('ipset-name', {
     type => 'string',
     pattern => '[A-Za-z][A-Za-z0-9\-\_]+',
     minLength => 2,
-    maxLength => 20,			  
+    maxLength => 20,
+});
+
+PVE::JSONSchema::register_standard_option('pve-fw-alias', {
+    description => "Alias name.",
+    type => 'string',
+    pattern => '[A-Za-z][A-Za-z0-9\-\_]+',
+    minLength => 2,
+    maxLength => 20,
 });
 
 PVE::JSONSchema::register_standard_option('pve-fw-loglevel' => {
     description => "Log level.",
-    type => 'string', 
+    type => 'string',
     enum => ['emerg', 'alert', 'crit', 'err', 'warning', 'notice', 'info', 'debug', 'nolog'],
     optional => 1,
 });
 
-my $security_group_pattern = '[A-Za-z][A-Za-z0-9\-\_]+';
+my $security_group_name_pattern = '[A-Za-z][A-Za-z0-9\-\_]+';
+my $ip_alias_pattern = '[A-Za-z][A-Za-z0-9\-\_]+';
 
 PVE::JSONSchema::register_standard_option('pve-security-group-name', {
     description => "Security Group name.",
     type => 'string',
-    pattern => $security_group_pattern,
+    pattern => $security_group_name_pattern,
     minLength => 2,
-    maxLength => 20,				  
+    maxLength => 20,
 });
 
 my $feature_ipset_nomatch = 0;
@@ -89,9 +98,8 @@ use Data::Dumper;
 my $nodename = PVE::INotify::nodename();
 
 my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
-my $pve_fw_status_filename = "/var/lib/pve-firewall/pvefw.status";
 
-my $default_log_level = 'info';
+my $default_log_level = 'nolog'; # avoid logs by default
 
 my $log_level_hash = {
     debug => 7,
@@ -149,9 +157,8 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'tcp', dport => '6277' },
     ],
     'DHCPfwd' => [
-	"Forwarded DHCP traffic (bidirectional)",
+	"Forwarded DHCP traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '67:68', sport => '67:68' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '67:68', sport => '67:68' },
     ],
     'DNS' => [
 	"Domain Name System traffic (upd and tcp)",
@@ -178,9 +185,8 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'udp', dport => '1080' },
     ],
     'GRE' => [
-	"Generic Routing Encapsulation tunneling protocol (bidirectional)",
+	"Generic Routing Encapsulation tunneling protocol",
 	{ action => 'PARAM', proto => '47' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' },
     ],
     'Git' => [
 	"Git distributed revision control traffic",
@@ -215,32 +221,24 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'tcp', dport => '993' },
     ],
     'IPIP' => [
-	"IPIP capsulation traffic (bidirectional)",
+	"IPIP capsulation traffic",
 	{ action => 'PARAM', proto => '94' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '94' },
     ],
     'IPsec' => [
-	"IPsec traffic (bidirectional)",
+	"IPsec traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '500', sport => '500' },
 	{ action => 'PARAM', proto => '50' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' },
     ],
     'IPsecah' => [
-	"IPsec authentication (AH) traffic (bidirectional)",
+	"IPsec authentication (AH) traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '500', sport => '500' },
 	{ action => 'PARAM', proto => '51' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500', sport => '500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '51' },
     ],
     'IPsecnat' => [
-	"IPsec traffic and Nat-Traversal (bidirectional)",
+	"IPsec traffic and Nat-Traversal",
 	{ action => 'PARAM', proto => 'udp', dport => '500' },
 	{ action => 'PARAM', proto => 'udp', dport => '4500' },
 	{ action => 'PARAM', proto => '50' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '4500' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '50' },
     ],
     'IRC' => [
 	"Internet Relay Chat traffic",
@@ -253,7 +251,6 @@ my $pve_fw_macros = {
     'L2TP' => [
 	"Layer 2 Tunneling Protocol traffic",
 	{ action => 'PARAM', proto => 'udp', dport => '1701' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1701' },
     ],
     'LDAP' => [
 	"Lightweight Directory Access Protocol traffic",
@@ -297,11 +294,6 @@ my $pve_fw_macros = {
 	"Network Time Protocol (ntpd)",
 	{ action => 'PARAM', proto => 'udp', dport => '123' },
     ],
-    'NTPbi' => [
-	"Bi-directional NTP (for NTP peers)",
-	{ action => 'PARAM', proto => 'udp', dport => '123' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '123' },
-    ],
     'OSPF' => [
 	"OSPF multicast traffic",
 	{ action => 'PARAM', proto => '89' },
@@ -326,7 +318,6 @@ my $pve_fw_macros = {
     'PPtP' => [
 	"Point-to-Point Tunneling Protocol",
 	{ action => 'PARAM', proto => '47' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => '47' },
 	{ action => 'PARAM', proto => 'tcp', dport => '1723' },
     ],
     'Ping' => [
@@ -345,10 +336,9 @@ my $pve_fw_macros = {
 	"Microsoft Remote Desktop Protocol traffic",
 	{ action => 'PARAM', proto => 'tcp', dport => '3389' },
     ],
-    'RIPbi' => [
+    'RIP' => [
 	"Routing Information Protocol (bidirectional)",
 	{ action => 'PARAM', proto => 'udp', dport => '520' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '520' },
     ],
     'RNDC' => [
 	"BIND remote management protocol",
@@ -377,17 +367,6 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' },
 	{ action => 'PARAM', proto => 'tcp', dport => '135,139,445' },
     ],
-    'SMBBI' => [
-	"Microsoft SMB traffic (bidirectional)",
-	{ action => 'PARAM', proto => 'udp', dport => '135,445' },
-	{ action => 'PARAM', proto => 'udp', dport => '137:139' },
-	{ action => 'PARAM', proto => 'udp', dport => '1024:65535', sport => '137' },
-	{ action => 'PARAM', proto => 'tcp', dport => '135,139,445' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '135,445' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '137:139' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'udp', dport => '1024:65535', sport => '137' },
-	{ action => 'PARAM', source => 'DEST', dest => 'SOURCE', proto => 'tcp', dport => '135,139,445' },
-    ],
     'SMBswat' => [
 	"Samba Web Administration Tool",
 	{ action => 'PARAM', proto => 'tcp', dport => '901' },
@@ -459,8 +438,8 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'icmp', dport => 'echo-request' },
     ],
     'VNC' => [
-	"VNC traffic for VNC display's 0 - 9",
-	{ action => 'PARAM', proto => 'tcp', dport => '5900:5909' },
+	"VNC traffic for VNC display's 0 - 99",
+	{ action => 'PARAM', proto => 'tcp', dport => '5900:5999' },
     ],
     'VNCL' => [
 	"VNC traffic from Vncservers to Vncviewers in listen mode",
@@ -708,11 +687,63 @@ sub get_etc_protocols {
     return $etc_protocols;
 }
 
+my $ipv4_mask_hash_localnet = {
+    '255.255.0.0' => 16,
+    '255.255.128.0' => 17,
+    '255.255.192.0' => 18,
+    '255.255.224.0' => 19,
+    '255.255.240.0' => 20,
+    '255.255.248.0' => 21,
+    '255.255.252.0' => 22,
+    '255.255.254.0' => 23,
+    '255.255.255.0' => 24,
+    '255.255.255.128' => 25,
+    '255.255.255.192' => 26,
+    '255.255.255.224' => 27,
+    '255.255.255.240' => 28,
+    '255.255.255.248' => 29,
+    '255.255.255.252' => 30,
+};
+
+my $__local_network;
+
+sub local_network {
+    my ($new_value) = @_;
+
+    $__local_network = $new_value if defined($new_value);
+
+    return $__local_network if defined($__local_network);
+
+    eval {
+	my $nodename = PVE::INotify::nodename();
+
+	my $ip = PVE::Cluster::remote_node_ip($nodename);
+
+	my $testip = Net::IP->new($ip);
+   
+	my $routes = PVE::ProcFSTools::read_proc_net_route();
+	foreach my $entry (@$routes) {
+	    my $mask = $ipv4_mask_hash_localnet->{$entry->{mask}};
+	    next if !defined($mask);
+	    return if $mask eq '0.0.0.0';
+	    my $cidr = "$entry->{dest}/$mask";
+	    my $testnet = Net::IP->new($cidr);
+	    if ($testnet->overlaps($testip)) {
+		$__local_network = $cidr;
+		return;
+	    }
+	}
+    };
+    warn $@ if $@;
+
+    return $__local_network;
+}
+
 sub parse_address_list {
     my ($str) = @_;
 
     return if $str =~ m/^(\+)(\S+)$/; # ipset ref
-    return if $str =~ m/^${security_group_pattern}$/; # aliases
+    return if $str =~ m/^${ip_alias_pattern}$/;
 
     my $count = 0;
     my $iprange = 0;
@@ -724,7 +755,7 @@ sub parse_address_list {
 	}
 	$iprange = 1 if $elem =~ m/-/;
     }
-    
+
     die "you can use a range in a list\n" if $iprange && $count > 1;
 }
 
@@ -748,7 +779,7 @@ sub parse_port_name_number_or_range {
 	    if ($icmp_type_names->{$item}) {
 		$icmp_port = 1;
 	    } else {
-		die "invalid port '$item'\n" if !$services->{byname}->{$item}; 
+		die "invalid port '$item'\n" if !$services->{byname}->{$item};
 	    }
 	}
     }
@@ -805,7 +836,7 @@ sub copy_opject_with_digest {
 	$sha->add($k, ':', $v, "\n");
     }
 
-    my $digest = $sha->b64digest;
+    my $digest = $sha->hexdigest;
 
     $res->{digest} = $digest;
 
@@ -829,7 +860,7 @@ sub copy_list_with_digest {
 	push @$res, $data;
     }
 
-    my $digest = $sha->b64digest;
+    my $digest = $sha->hexdigest;
 
     foreach my $entry (@$res) {
 	$entry->{digest} = $digest;
@@ -855,7 +886,7 @@ my $rule_properties = {
 	description => "Rule action ('ACCEPT', 'DROP', 'REJECT') or security group name.",
 	type => 'string',
 	optional => 1,
-	pattern => $security_group_pattern,
+	pattern => $security_group_name_pattern,
 	maxLength => 20,
 	minLength => 2,
     },
@@ -884,10 +915,12 @@ my $rule_properties = {
     sport => {
 	type => 'string', format => 'pve-fw-port-spec',
 	optional => 1,
+	requires => 'proto',
     },
     dport => {
 	type => 'string', format => 'pve-fw-port-spec',
 	optional => 1,
+	requires => 'proto',
     },
     comment => {
 	type => 'string',
@@ -909,7 +942,7 @@ sub add_rule_properties {
 
 sub delete_rule_properties {
     my ($rule, $delete_str) = @_;
-    
+
     foreach my $opt (PVE::Tools::split_list($delete_str)) {
 	raise_param_exc({ 'delete' => "no such property ('$opt')"})
 	    if !defined($rule_properties->{$opt});
@@ -947,7 +980,7 @@ my $apply_macro = sub {
 
 	    if (!defined($v)) {
 		my $msg = "missing parameter '$k' in macro '$macro_name'";
-		raise_param_exc({ macro => $msg }) if $verify; 
+		raise_param_exc({ macro => $msg }) if $verify;
 		die "$msg\n";
 	    }
 	    $rule->{$k} = $v;
@@ -959,7 +992,7 @@ my $apply_macro = sub {
 	    if (defined($rule->{$k})) {
 		if ($rule->{$k} ne $param->{$k}) {
 		    my $msg = "parameter '$k' already define in macro (value = '$rule->{$k}')";
-		    raise_param_exc({ $k => $msg }) if $verify; 
+		    raise_param_exc({ $k => $msg }) if $verify;
 		    die "$msg\n";
 		}
 	    } else {
@@ -979,20 +1012,23 @@ sub verify_rule {
 
     raise_param_exc({ type => "missing property"}) if !$type;
     raise_param_exc({ action => "missing property"}) if !$rule->{action};
- 
+
     if ($type eq  'in' || $type eq 'out') {
 	raise_param_exc({ action => "unknown action '$rule->{action}'"})
 	    if $rule->{action} !~ m/^(ACCEPT|DROP|REJECT)$/;
     } elsif ($type eq 'group') {
-	raise_param_exc({ type => "security groups not allowed"}) 
+	raise_param_exc({ type => "security groups not allowed"})
 	    if !$allow_groups;
-	raise_param_exc({ action => "invalid characters in security group name"}) 
-	    if $rule->{action} !~ m/^${security_group_pattern}$/;
+	raise_param_exc({ action => "invalid characters in security group name"})
+	    if $rule->{action} !~ m/^${security_group_name_pattern}$/;
     } else {
 	raise_param_exc({ type => "unknown rule type '$type'"});
     }
-   
-    # fixme: verify $rule->{iface}?
+
+    if ($rule->{iface}) {
+	eval { PVE::JSONSchema::pve_verify_iface($rule->{iface}); };
+	raise_param_exc({ iface => $@ }) if $@;
+    }	
 
     if ($rule->{macro}) {
 	my $preferred_name = $pve_fw_preferred_macro_names->{lc($rule->{macro})};
@@ -1093,7 +1129,7 @@ sub iptables_get_chains {
 
 	return 1 if $name =~ m/^venet0-\d+-(:?IN|OUT)$/;
 
-	return 1 if $name =~ m/^vmbr\d+-(:?FW|IN|OUT|IPS)$/;
+	return 1 if $name =~ m/^fwbr\d+(v\d+)?-(:?FW|IN|OUT|IPS)$/;
 	return 1 if $name =~ m/^GROUP-(:?[^\s\-]+)-(:?IN|OUT)$/;
 
 	return undef;
@@ -1205,14 +1241,18 @@ sub ruleset_generate_cmdstr {
     my $dest = $rule->{dest};
 
     if ($source) {
-        if ($source =~ m/^(\+)(\S+)$/) {
-	    die "no such ipset $2" if !$cluster_conf->{ipset}->{$2};
-	    push @cmd, "-m set --match-set PVEFW-$2 src";
-
-	} elsif ($source =~ m/^${security_group_pattern}$/){
-	    die "no such alias $source" if !$cluster_conf->{aliases}->{$source};
-	    push @cmd, "-s $cluster_conf->{aliases}->{$source}";
-
+        if ($source =~ m/^\+/) {
+	    if ($source =~ m/^\+(${security_group_name_pattern})$/) {
+		die "no such ipset '$1'\n" if !$cluster_conf->{ipset}->{$1};
+		push @cmd, "-m set --match-set PVEFW-$1 src";
+	    } else {
+		die "invalid security group name '$source'\n";
+	    }
+	} elsif ($source =~ m/^${ip_alias_pattern}$/){
+	    my $alias = lc($source);
+	    my $e = $cluster_conf->{aliases}->{$alias};
+	    die "no such alias $source\n" if !$e;
+	    push @cmd, "-s $e->{cidr}";
         } elsif ($source =~ m/\-/){
 	    push @cmd, "-m iprange --src-range $source";
 
@@ -1222,14 +1262,18 @@ sub ruleset_generate_cmdstr {
     }
 
     if ($dest) {
-        if ($dest =~ m/^(\+)(\S+)$/) {
-	    die "no such ipset $2" if !$cluster_conf->{ipset}->{$2};
-	    push @cmd, "-m set --match-set PVEFW-$2 dst";
-
-	} elsif ($dest =~ m/^${security_group_pattern}$/){
-	    die "no such alias $dest" if !$cluster_conf->{aliases}->{$dest};
-	    push @cmd, "-d $cluster_conf->{aliases}->{$dest}";
-
+        if ($dest =~ m/^\+/) {
+	    if ($dest =~ m/^\+(${security_group_name_pattern})$/) {
+		die "no such ipset '$1'\n" if !$cluster_conf->{ipset}->{$1};
+		push @cmd, "-m set --match-set PVEFW-$1 dst";
+	    } else {
+		die "invalid security group name '$dest'\n";
+	    }
+	} elsif ($dest =~ m/^${ip_alias_pattern}$/){
+	    my $alias = lc($dest);
+	    my $e = $cluster_conf->{aliases}->{$alias};
+	    die "no such alias $dest" if !$e;
+	    push @cmd, "-d $e->{cidr}";
         } elsif ($dest =~ m/^(\d+)\.(\d+).(\d+).(\d+)\-(\d+)\.(\d+).(\d+).(\d+)$/){
 	    push @cmd, "-m iprange --dst-range $dest";
 
@@ -1276,8 +1320,8 @@ sub ruleset_generate_cmdstr {
 	    }
 	}
     } elsif ($rule->{dport} || $rule->{sport}) {
-	warn "ignoring destination port '$rule->{dport}' - no protocol specified\n" if $rule->{dport};
-	warn "ignoring source port '$rule->{sport}' - no protocol specified\n" if $rule->{sport};
+	die "destination port '$rule->{dport}', but no protocol specified\n" if $rule->{dport};
+	die "source port '$rule->{sport}', but no protocol specified\n" if $rule->{sport};
     }
 
     push @cmd, "-m addrtype --dst-type $rule->{dsttype}" if $rule->{dsttype};
@@ -1302,11 +1346,18 @@ sub ruleset_generate_rule {
 	$rules = [ $rule ];
     }
 
+    # update all or nothing
+
+    my @cmds = ();
     foreach my $tmp (@$rules) {
 	if (my $cmdstr = ruleset_generate_cmdstr($ruleset, $chain, $tmp, $actions, $goto, $cluster_conf)) {
-	    ruleset_addrule($ruleset, $chain, $cmdstr);
+	    push @cmds, $cmdstr;
 	}
     }
+
+    foreach my $cmdstr (@cmds) {
+	ruleset_addrule($ruleset, $chain, $cmdstr);
+    }
 }
 
 sub ruleset_generate_rule_insert {
@@ -1374,50 +1425,7 @@ sub ruleset_addlog {
 
     $logrule = "$rule $logrule" if defined($rule);
 
-    ruleset_addrule($ruleset, $chain, $logrule)
-}
-
-sub generate_bridge_chains {
-    my ($ruleset, $hostfw_conf, $bridge, $routing_table, $bridges_config) = @_;
-
-    my $options = $hostfw_conf->{options} || {};
-
-    die "error: detected direct route to bridge '$bridge'\n"
-	if !$options->{allow_bridge_route} && $routing_table->{$bridge};
-
-    if (!ruleset_chain_exist($ruleset, "$bridge-FW")) {
-	ruleset_create_chain($ruleset, "$bridge-FW");
-	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o $bridge -m physdev --physdev-is-out -j $bridge-FW");
-	ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i $bridge -m physdev --physdev-is-in -j $bridge-FW");
-    }
-
-    if (!ruleset_chain_exist($ruleset, "$bridge-OUT")) {
-	ruleset_create_chain($ruleset, "$bridge-OUT");
-
-	if($options->{optimize}){
-	    foreach my $interface (@{$bridges_config->{$bridge}}) {
-		ruleset_addrule($ruleset, "$bridge-OUT", "-m physdev --physdev-is-bridged --physdev-in $interface -g PVEFW-SET-ACCEPT-MARK");
-	    }
-	}
-
-	ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-in -j $bridge-OUT");
-	ruleset_insertrule($ruleset, "PVEFW-INPUT", "-i $bridge -m physdev --physdev-is-in -j $bridge-OUT");
-    }
-
-    if (!ruleset_chain_exist($ruleset, "$bridge-IN")) {
-	ruleset_create_chain($ruleset, "$bridge-IN");
-
-	if($options->{optimize}){
-	    foreach my $interface (@{$bridges_config->{$bridge}}) {
-		ruleset_addrule($ruleset, "$bridge-IN", "-m physdev --physdev-is-bridged --physdev-out $interface -j ACCEPT");
-	    }
-	}
-
-	ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-out -j $bridge-IN");
-	ruleset_addrule($ruleset, "$bridge-FW", "-m mark --mark 1 -j ACCEPT");
-	# accept traffic to unmanaged bridge ports
-	ruleset_addrule($ruleset, "$bridge-FW", "-m physdev --physdev-is-out -j ACCEPT ");
-    }
+    ruleset_addrule($ruleset, $chain, $logrule);
 }
 
 sub ruleset_add_chain_policy {
@@ -1447,16 +1455,36 @@ sub ruleset_add_chain_policy {
     }
 }
 
-sub ruleset_create_vm_chain {
-    my ($ruleset, $chain, $options, $host_options, $macaddr, $direction) = @_;
+sub ruleset_chain_add_conn_filters {
+    my ($ruleset, $chain, $accept) = @_;
 
-    ruleset_create_chain($ruleset, $chain);
-    my $accept = generate_nfqueue($options);
+    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
+    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
+}
+
+sub ruleset_chain_add_input_filters {
+    my ($ruleset, $chain, $options, $cluster_conf, $loglevel) = @_;
 
-    if (!(defined($host_options->{nosmurfs}) && $host_options->{nosmurfs} == 0)) {
+    if ($cluster_conf->{ipset}->{blacklist}){
+	ruleset_addlog($ruleset, $chain, 0, "DROP: ", $loglevel, "-m set --match-set PVEFW-blacklist src");
+	ruleset_addrule($ruleset, $chain, "-m set --match-set PVEFW-blacklist src -j DROP");
+    }
+
+    if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
 	ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
     }
 
+    if ($options->{tcpflags}) {
+	ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags");
+    }
+}
+
+sub ruleset_create_vm_chain {
+    my ($ruleset, $chain, $options, $macaddr, $direction) = @_;
+
+    ruleset_create_chain($ruleset, $chain);
+    my $accept = generate_nfqueue($options);
+
     if (!(defined($options->{dhcp}) && $options->{dhcp} == 0)) {
 	if ($direction eq 'OUT') {
 	    ruleset_generate_rule($ruleset, $chain, { action => 'PVEFW-SET-ACCEPT-MARK',
@@ -1467,17 +1495,6 @@ sub ruleset_create_vm_chain {
 	}
     }
 
-    if ($host_options->{tcpflags}) {
-	ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags");
-    }
-
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
-    if ($direction eq 'OUT') {
-	ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -g PVEFW-SET-ACCEPT-MARK");
-    } else {
-	ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
-    }
-
     if ($direction eq 'OUT') {
 	if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
 	    ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP");
@@ -1486,36 +1503,53 @@ sub ruleset_create_vm_chain {
     }
 }
 
+sub ruleset_add_group_rule {
+    my ($ruleset, $cluster_conf, $chain, $rule, $direction, $action) = @_;
+
+    my $group = $rule->{action};
+    my $group_chain = "GROUP-$group-$direction";
+    if(!ruleset_chain_exist($ruleset, $group_chain)){
+	generate_group_rules($ruleset, $cluster_conf, $group);
+    }
+	
+    if ($direction eq 'OUT' && $rule->{iface_out}) {
+	ruleset_addrule($ruleset, $chain, "-o $rule->{iface_out} -j $group_chain");
+    } elsif ($direction eq 'IN' && $rule->{iface_in}) {
+	ruleset_addrule($ruleset, $chain, "-i $rule->{iface_in} -j $group_chain");
+    } else {
+	ruleset_addrule($ruleset, $chain, "-j $group_chain");
+    }
+
+    ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $action");
+}
+
 sub ruleset_generate_vm_rules {
     my ($ruleset, $rules, $cluster_conf, $chain, $netid, $direction, $options) = @_;
 
     my $lc_direction = lc($direction);
 
+    my $in_accept = generate_nfqueue($options);
+
     foreach my $rule (@$rules) {
 	next if $rule->{iface} && $rule->{iface} ne $netid;
 	next if !$rule->{enable};
 	if ($rule->{type} eq 'group') {
-	    my $group_chain = "GROUP-$rule->{action}-$direction";
-	    if(!ruleset_chain_exist($ruleset, $group_chain)){
-		generate_group_rules($ruleset, $cluster_conf, $rule->{action});
-	    }
-	    ruleset_addrule($ruleset, $chain, "-j $group_chain");
-	    if ($direction eq 'OUT'){
-		ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j RETURN");
-	    }else{
-		my $accept = generate_nfqueue($options);
-		ruleset_addrule($ruleset, $chain, "-m mark --mark 1 -j $accept");
-	    }
-
+	    ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, $direction,
+				   $direction eq 'OUT' ? 'RETURN' : $in_accept);
 	} else {
 	    next if $rule->{type} ne $lc_direction;
-	    if ($direction eq 'OUT') {
-		ruleset_generate_rule($ruleset, $chain, $rule,
-				      { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" }, undef, $cluster_conf);
-	    } else {
-		my $accept = generate_nfqueue($options);
-		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept , REJECT => "PVEFW-reject" }, undef, $cluster_conf);
-	    }
+	    eval {
+		if ($direction eq 'OUT') {
+		    ruleset_generate_rule($ruleset, $chain, $rule,
+					  { ACCEPT => "PVEFW-SET-ACCEPT-MARK", REJECT => "PVEFW-reject" },
+					  undef, $cluster_conf);
+		} else {
+		    ruleset_generate_rule($ruleset, $chain, $rule,
+					  { ACCEPT => $in_accept , REJECT => "PVEFW-reject" },
+					  undef, $cluster_conf);
+		}
+	    };
+	    warn $@ if $@;
 	}
     }
 }
@@ -1523,59 +1557,49 @@ sub ruleset_generate_vm_rules {
 sub generate_nfqueue {
     my ($options) = @_;
 
-    my $action = "";
-    if($options->{ips}){
-	$action = "NFQUEUE";
-	if($options->{ips_queues} && $options->{ips_queues} =~ m/^(\d+)(:(\d+))?$/) {
-	    if(defined($3) && defined($1)) {
+    if ($options->{ips}) {
+	my $action = "NFQUEUE";
+	if ($options->{ips_queues} && $options->{ips_queues} =~ m/^(\d+)(:(\d+))?$/) {
+	    if (defined($3) && defined($1)) {
 		$action .= " --queue-balance $1:$3";
-	    }elsif (defined($1)) {
+	    } elsif (defined($1)) {
 		$action .= " --queue-num $1";
 	    }
 	}
 	$action .= " --queue-bypass" if $feature_ipset_nomatch; #need kernel 3.10
-    }else{
-	$action = "ACCEPT";
+	return $action;
+    } else {
+	return "ACCEPT";
     }
-
-    return $action;
 }
 
 sub ruleset_generate_vm_ipsrules {
-    my ($ruleset, $options, $direction, $iface, $bridge) = @_;
+    my ($ruleset, $options, $direction, $iface) = @_;
 
     if ($options->{ips} && $direction eq 'IN') {
 	my $nfqueue = generate_nfqueue($options);
 
-	if (!ruleset_chain_exist($ruleset, "$bridge-IPS")) {
+	if (!ruleset_chain_exist($ruleset, "PVEFW-IPS")) {
 	    ruleset_create_chain($ruleset, "PVEFW-IPS");
 	}
 
-	if (!ruleset_chain_exist($ruleset, "$bridge-IPS")) {
-	    ruleset_create_chain($ruleset, "$bridge-IPS");
-	    ruleset_insertrule($ruleset, "PVEFW-IPS", "-o $bridge -m physdev --physdev-is-out -j $bridge-IPS");
-	}
-
-        ruleset_addrule($ruleset, "$bridge-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged -j $nfqueue");
+        ruleset_addrule($ruleset, "PVEFW-IPS", "-m physdev --physdev-out $iface --physdev-is-bridged -j $nfqueue");
     }
 }
 
 sub generate_venet_rules_direction {
-    my ($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, $direction) = @_;
-
-    parse_address_list($ip); # make sure we have a valid $ip list
+    my ($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, $direction) = @_;
 
     my $lc_direction = lc($direction);
 
     my $rules = $vmfw_conf->{rules};
 
     my $options = $vmfw_conf->{options};
-    my $hostfw_options = $vmfw_conf->{options};
     my $loglevel = get_option_log_level($options, "log_level_${lc_direction}");
 
     my $chain = "venet0-$vmid-$direction";
 
-    ruleset_create_vm_chain($ruleset, $chain, $options, $hostfw_options, undef, $direction);
+    ruleset_create_vm_chain($ruleset, $chain, $options, undef, $direction);
 
     ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $chain, 'venet', $direction);
 
@@ -1592,24 +1616,13 @@ sub generate_venet_rules_direction {
     my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept;
     ruleset_add_chain_policy($ruleset, $chain, $vmid, $policy, $loglevel, $accept_action);
 
-    # plug into FORWARD, INPUT and OUTPUT chain
     if ($direction eq 'OUT') {
-	ruleset_generate_rule_insert($ruleset, "PVEFW-FORWARD", {
-	    action => $chain,
-	    source => $ip,
-	    iface_in => 'venet0'});
-
-	ruleset_generate_rule_insert($ruleset, "PVEFW-INPUT", {
+	ruleset_generate_rule_insert($ruleset, "PVEFW-VENET-OUT", {
 	    action => $chain,
 	    source => $ip,
 	    iface_in => 'venet0'});
     } else {
-	ruleset_generate_rule($ruleset, "PVEFW-FORWARD", {
-	    action => $chain,
-	    dest => $ip,
-	    iface_out => 'venet0'});
-
-	ruleset_generate_rule($ruleset, "PVEFW-OUTPUT", {
+	ruleset_generate_rule($ruleset, "PVEFW-VENET-IN", {
 	    action => $chain,
 	    dest => $ip,
 	    iface_out => 'venet0'});
@@ -1617,23 +1630,22 @@ sub generate_venet_rules_direction {
 }
 
 sub generate_tap_rules_direction {
-    my ($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $bridge, $direction) = @_;
+    my ($ruleset, $cluster_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $direction) = @_;
 
     my $lc_direction = lc($direction);
 
     my $rules = $vmfw_conf->{rules};
 
     my $options = $vmfw_conf->{options};
-    my $hostfw_options = $hostfw_conf->{options};
     my $loglevel = get_option_log_level($options, "log_level_${lc_direction}");
 
     my $tapchain = "$iface-$direction";
 
-    ruleset_create_vm_chain($ruleset, $tapchain, $options, $hostfw_options, $macaddr, $direction);
+    ruleset_create_vm_chain($ruleset, $tapchain, $options, $macaddr, $direction);
 
     ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $tapchain, $netid, $direction, $options);
 
-    ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface, $bridge);
+    ruleset_generate_vm_ipsrules($ruleset, $options, $direction, $iface);
 
     # implement policy
     my $policy;
@@ -1650,11 +1662,11 @@ sub generate_tap_rules_direction {
 
     # plug the tap chain to bridge chain
     if ($direction eq 'IN') {
-	ruleset_addrule($ruleset, "$bridge-IN",
-			   "-m physdev --physdev-is-bridged --physdev-out $iface -j $tapchain");
+	ruleset_addrule($ruleset, "PVEFW-FWBR-IN",
+			"-m physdev --physdev-is-bridged --physdev-out $iface -j $tapchain");
     } else {
-	ruleset_addrule($ruleset, "$bridge-OUT",
-			   "-m physdev --physdev-in $iface -j $tapchain");
+	ruleset_addrule($ruleset, "PVEFW-FWBR-OUT",
+			"-m physdev --physdev-is-bridged --physdev-in $iface -j $tapchain");
     }
 }
 
@@ -1672,28 +1684,45 @@ sub enable_host_firewall {
 
     my $loglevel = get_option_log_level($options, "log_level_in");
 
-    if (!(defined($options->{nosmurfs}) && $options->{nosmurfs} == 0)) {
-	ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID,NEW -j PVEFW-smurfs");
-    }
-
-    if ($options->{tcpflags}) {
-	ruleset_addrule($ruleset, $chain, "-p tcp -j PVEFW-tcpflags");
-    }
-
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT");
     ruleset_addrule($ruleset, $chain, "-i lo -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW --dport 5404:5405 -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT");  #corosync
+
+    ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
+    ruleset_chain_add_input_filters($ruleset, $chain, $options, $cluster_conf, $loglevel);
 
     # we use RETURN because we need to check also tap rules
     my $accept_action = 'RETURN';
 
+    ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
-	next if $rule->{type} ne 'in';
-	ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
+	$rule->{iface_in} = $rule->{iface} if $rule->{iface};
+	eval {
+	    if ($rule->{type} eq 'group') {
+		ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'IN', $accept_action);
+	    } elsif ($rule->{type} eq 'in') {
+		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, 
+				      undef, $cluster_conf);
+	    }
+	};
+	warn $@ if $@;
+	delete $rule->{iface_in};
+    }
+
+    # allow standard traffic for management ipset (includes cluster network)
+    my $mngmntsrc = "-m set --match-set PVEFW-management src";
+    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 8006 -j $accept_action");  # PVE API
+    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 5900:5999 -j $accept_action");  # PVE VNC Console 
+    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 3128 -j $accept_action");  # SPICE Proxy
+    ruleset_addrule($ruleset, $chain, "$mngmntsrc -p tcp --dport 22 -j $accept_action");  # SSH
+   
+    my $localnet = local_network();
+
+    # corosync
+    if ($localnet) {
+	my $corosync_rule = "-p udp --dport 5404:5405 -j $accept_action";
+	ruleset_addrule($ruleset, $chain, "-s $localnet -d $localnet $corosync_rule");
+	ruleset_addrule($ruleset, $chain, "-s $localnet -m addrtype --dst-type MULTICAST $corosync_rule");
     }
 
     # implement input policy
@@ -1706,20 +1735,40 @@ sub enable_host_firewall {
 
     $loglevel = get_option_log_level($options, "log_level_out");
 
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate INVALID -j DROP");
-    ruleset_addrule($ruleset, $chain, "-m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT");
     ruleset_addrule($ruleset, $chain, "-o lo -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m conntrack --ctstate NEW --dport 5404:5405 -j ACCEPT");
-    ruleset_addrule($ruleset, $chain, "-p udp -m udp --dport 9000 -j ACCEPT"); #corosync
+
+    ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
 
     # we use RETURN because we may want to check other thigs later
     $accept_action = 'RETURN';
 
+    ruleset_addrule($ruleset, $chain, "-p igmp -j $accept_action"); # important for multicast
+
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
-	next if $rule->{type} ne 'out';
-	ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, undef, $cluster_conf);
+	$rule->{iface_out} = $rule->{iface} if $rule->{iface};
+	eval {
+	    if ($rule->{type} eq 'group') {
+		ruleset_add_group_rule($ruleset, $cluster_conf, $chain, $rule, 'OUT', $accept_action);
+	    } elsif ($rule->{type} eq 'out') {
+		ruleset_generate_rule($ruleset, $chain, $rule, { ACCEPT => $accept_action, REJECT => "PVEFW-reject" }, 
+				      undef, $cluster_conf);
+	    }
+	};
+	warn $@ if $@;
+	delete $rule->{iface_out};
+    }
+
+    # allow standard traffic on cluster network
+    if ($localnet) {
+	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 8006 -j $accept_action");  # PVE API
+	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 22 -j $accept_action");  # SSH
+	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 5900:5999 -j $accept_action");  # PVE VNC Console 
+	ruleset_addrule($ruleset, $chain, "-d $localnet -p tcp --dport 3128 -j $accept_action");  # SPICE Proxy
+ 
+	my $corosync_rule = "-p udp --dport 5404:5405 -j $accept_action";
+	ruleset_addrule($ruleset, $chain, "-d $localnet $corosync_rule");
+	ruleset_addrule($ruleset, $chain, "-m addrtype --dst-type MULTICAST $corosync_rule");
     }
 
     # implement output policy
@@ -1732,10 +1781,14 @@ sub enable_host_firewall {
 
 sub generate_group_rules {
     my ($ruleset, $cluster_conf, $group) = @_;
-    die "no such security group '$group'\n" if !$cluster_conf->{groups}->{$group};
 
     my $rules = $cluster_conf->{groups}->{$group};
 
+    if (!$rules) {
+	warn "no such security group '$group'\n";
+	$rules = []; # create empty chain
+    }
+
     my $chain = "GROUP-${group}-IN";
 
     ruleset_create_chain($ruleset, $chain);
@@ -1767,9 +1820,11 @@ for (my $i = 0; $i < $MAX_NETS; $i++)  {
 }
 
 sub parse_fw_rule {
-    my ($line, $need_iface, $allow_groups) = @_;
+    my ($line, $allow_iface, $allow_groups) = @_;
 
-    my ($type, $action, $iface, $source, $dest, $proto, $dport, $sport);
+    my ($type, $action, $macro, $iface, $source, $dest, $proto, $dport, $sport);
+
+    chomp $line;
 
     # we can add single line comments to the end of the rule
     my $comment = decode('utf8', $1) if $line =~ s/#\s*(.*?)\s*$//;
@@ -1779,22 +1834,11 @@ sub parse_fw_rule {
 
     $enable = 0 if $line =~ s/^\|//;
 
-    my @data = split(/\s+/, $line);
-    my $expected_elements = $need_iface ? 8 : 7;
-
-    die "wrong number of rule elements\n" if scalar(@data) > $expected_elements;
-
-    if ($need_iface) {
-	($type, $action, $iface, $source, $dest, $proto, $dport, $sport) = @data
-    } else {
-	($type, $action, $source, $dest, $proto, $dport, $sport) =  @data;
-    }
-
-    die "incomplete rule\n" if ! ($type && $action);
-
-    my $macro;
-
-    $type = lc($type);
+    $line =~ s/^(\S+)\s+(\S+)\s*// ||
+ 	die "unable to parse rule: $line\n";
+    
+    $type = lc($1);
+    $action = $2;
 
     if ($type eq  'in' || $type eq 'out') {
 	if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
@@ -1808,32 +1852,52 @@ sub parse_fw_rule {
 	    die "unknown action '$action'\n";
 	}
     } elsif ($type eq 'group') {
-	die "wrong number of rule elements\n" if scalar(@data) != 3;
 	die "groups disabled\n" if !$allow_groups;
-
-	die "invalid characters in group name\n" if $action !~ m/^${security_group_pattern}$/;
+	die "invalid characters in group name\n" if $action !~ m/^${security_group_name_pattern}$/;
     } else {
 	die "unknown rule type '$type'\n";
     }
 
-    if ($need_iface) {
-	$iface = undef if $iface && $iface eq '-';
-    }
-
-    $proto = undef if $proto && $proto eq '-';
-    pve_fw_verify_protocol_spec($proto) if $proto;
+    while (length($line)) {
+	if ($line =~ s/^-i (\S+)\s*//) {
+	    die "parameter -i not allowed\n" if !$allow_iface;
+	    $iface = $1;
+	    PVE::JSONSchema::pve_verify_iface($iface);
+	    next;
+	}
 
-    $source = undef if $source && $source eq '-';
-    $dest = undef if $dest && $dest eq '-';
+	last if $type eq 'group';
 
-    $dport = undef if $dport && $dport eq '-';
-    $sport = undef if $sport && $sport eq '-';
+	if ($line =~ s/^-p (\S+)\s*//) {
+	    $proto = $1;
+	    pve_fw_verify_protocol_spec($proto);
+	    next;
+	}
+	if ($line =~ s/^-dport (\S+)\s*//) {
+	    $dport = $1;
+	    parse_port_name_number_or_range($dport);
+	    next;
+	}
+	if ($line =~ s/^-sport (\S+)\s*//) {
+	    $sport = $1;
+	    parse_port_name_number_or_range($sport);
+	    next;
+	}
+	if ($line =~ s/^-source (\S+)\s*//) {
+	    $source = $1;
+	    parse_address_list($source);
+	    next;
+	}
+	if ($line =~ s/^-dest (\S+)\s*//) {
+	    $dest = $1;
+	    parse_address_list($dest);
+	    next;
+	}
 
-    parse_port_name_number_or_range($dport) if defined($dport);
-    parse_port_name_number_or_range($sport) if defined($sport);
+	last;
+    }
 
-    parse_address_list($source) if $source;
-    parse_address_list($dest) if $dest;
+    die "unable to parse rule parameters: $line\n" if length($line);
 
     return {
 	type => $type,
@@ -1884,7 +1948,7 @@ sub parse_hostfw_option {
 
     my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog";
 
-    if ($line =~ m/^(enable|nosmurfs|tcpflags|allow_bridge_route|optimize):\s*(0|1)\s*$/i) {
+    if ($line =~ m/^(enable|nosmurfs|tcpflags):\s*(0|1)\s*$/i) {
 	$opt = lc($1);
 	$value = int($2);
     } elsif ($line =~ m/^(log_level_in|log_level_out|tcp_flags_log_level|smurf_log_level):\s*(($loglevels)\s*)?$/i) {
@@ -1920,29 +1984,35 @@ sub parse_clusterfw_option {
     return ($opt, $value);
 }
 
-sub parse_clusterfw_alias {
+sub parse_alias {
     my ($line) = @_;
 
-    my ($opt, $value);
+    # we can add single line comments to the end of the line
+    my $comment = decode('utf8', $1) if $line =~ s/\s*#\s*(.*?)\s*$//;
+
     if ($line =~ m/^(\S+)\s(\S+)$/) {
-	$opt = lc($1);
-	if($2){
-	    $2 =~ s|/32$||;
-	    pve_verify_ipv4_or_cidr($2) if $2;
-	    $value = $2;
-	}
-    } else {
-	chomp $line;
-	die "can't parse option '$line'\n";
+	my ($name, $cidr) = ($1, $2);
+	$cidr =~ s|/32$||;
+	pve_verify_ipv4_or_cidr($cidr);
+	my $data = {
+	    name => $name,
+	    cidr => $cidr,
+	};
+	$data->{comment} = $comment  if $comment;
+	return $data;
     }
 
-    return ($opt, $value);
+    return undef;
 }
 
 sub parse_vm_fw_rules {
     my ($filename, $fh) = @_;
 
-    my $res = { rules => [], options => {}};
+    my $res = { 
+	rules => [], 
+	options => {},
+	aliases => {},
+    };
 
     my $section;
 
@@ -1974,6 +2044,15 @@ sub parse_vm_fw_rules {
 	    next;
 	}
 
+	if ($section eq 'aliases') {
+	    eval {
+		my $data = parse_alias($line);
+		$res->{aliases}->{lc($data->{name})} = $data;
+	    };
+	    warn "$prefix: $@" if $@;
+	    next;
+	}
+
 	my $rule;
 	eval { $rule = parse_fw_rule($line, 1, 1); };
 	if (my $err = $@) {
@@ -2041,13 +2120,14 @@ sub parse_cluster_fw_rules {
     my $section;
     my $group;
 
-    my $res = { 
-	rules => [], 
-	options => {}, 
-	groups => {}, 
-	group_comments => {}, 
+    my $res = {
+	rules => [],
+	options => {},
+	aliases => {},
+	groups => {},
+	group_comments => {},
 	ipset => {} ,
-	ipset_comments => {}, 
+	ipset_comments => {},
     };
 
     while (defined(my $line = <$fh>)) {
@@ -2087,7 +2167,7 @@ sub parse_cluster_fw_rules {
 	    $group = lc($1);
 	    my $comment = $2;
 	    $res->{$section}->{$group} = [];
-	    $res->{ipset_comments}->{$group} = decode('utf8', $comment) 
+	    $res->{ipset_comments}->{$group} = decode('utf8', $comment)
 		if $comment;
 	    next;
 	}
@@ -2105,8 +2185,8 @@ sub parse_cluster_fw_rules {
 	    warn "$prefix: $@" if $@;
 	} elsif ($section eq 'aliases') {
 	    eval {
-		my ($opt, $value) = parse_clusterfw_alias($line);
-		$res->{aliases}->{$opt} = $value;
+		my $data = parse_alias($line);
+		$res->{aliases}->{lc($data->{name})} = $data;
 	    };
 	    warn "$prefix: $@" if $@;
 	} elsif ($section eq 'rules') {
@@ -2133,9 +2213,9 @@ sub parse_cluster_fw_rules {
 	    my $nomatch = $1;
 	    my $cidr = $2;
 
-	    if($cidr !~ m/^${security_group_pattern}$/) {
+	    if($cidr !~ m/^${ip_alias_pattern}$/) {
 		$cidr =~ s|/32$||;
-	    
+
 		eval { pve_verify_ipv4_or_cidr($cidr); };
 		if (my $err = $@) {
 		    warn "$prefix: $cidr - $err";
@@ -2143,10 +2223,10 @@ sub parse_cluster_fw_rules {
 		}
 	    }
 
-	    my $entry = { cidr => $cidr }; 
+	    my $entry = { cidr => $cidr };
 	    $entry->{nomatch} = 1 if $nomatch;
 	    $entry->{comment} = $comment if $comment;
-	    
+
 	    push @{$res->{$section}->{$group}}, $entry;
 	}
     }
@@ -2202,28 +2282,14 @@ sub read_local_vm_config {
     return $vmdata;
 };
 
-sub read_bridges_config {
-
-    my $bridgehash = {};
-
-    dir_glob_foreach('/sys/class/net', 'vmbr(\d+)', sub {
-        my ($bridge) = @_;
-
-	dir_glob_foreach("/sys/class/net/$bridge/brif", '((eth|bond)(\d+)(\.(\d+))?)', sub {
-	    my ($interface) = @_;
-	    push @{$bridgehash->{$bridge}}, $interface;
-	});
-    });
-
-    return $bridgehash;
-};
-
 sub load_vmfw_conf {
-    my ($vmid) = @_;
+    my ($vmid, $dir) = @_;
 
     my $vmfw_conf = {};
 
-    my $filename = "/etc/pve/firewall/$vmid.fw";
+    $dir = "/etc/pve/firewall" if !defined($dir);
+
+    my $filename = "$dir/$vmid.fw";
     if (my $fh = IO::File->new($filename, O_RDONLY)) {
 	$vmfw_conf = parse_vm_fw_rules($filename, $fh);
     }
@@ -2232,7 +2298,7 @@ sub load_vmfw_conf {
 }
 
 my $format_rules = sub {
-    my ($rules, $need_iface) = @_;
+    my ($rules, $allow_iface) = @_;
 
     my $raw = '';
 
@@ -2245,14 +2311,16 @@ my $format_rules = sub {
 	    } else {
 		$raw .= " " . $rule->{action};
 	    }
-	    $raw .= " " . ($rule->{iface} || '-') if $need_iface;
+	    if ($allow_iface && $rule->{iface}) {
+		$raw .= " -i $rule->{iface}";
+	    }
 
 	    if ($rule->{type} ne  'group')  {
-		$raw .= " " . ($rule->{source} || '-');
-		$raw .= " " . ($rule->{dest} || '-');
-		$raw .= " " . ($rule->{proto} || '-');
-		$raw .= " " . ($rule->{dport} || '-');
-		$raw .= " " . ($rule->{sport} || '-');
+		$raw .= " -source $rule->{source}" if $rule->{source};
+		$raw .= " -dest $rule->{dest}" if $rule->{dest};
+		$raw .= " -p $rule->{proto}" if $rule->{proto};
+		$raw .= " -dport $rule->{dport}" if $rule->{dport};
+		$raw .= " -sport $rule->{sport}" if $rule->{sport};
 	    }
 
 	    $raw .= " # " . encode('utf8', $rule->{comment})
@@ -2280,6 +2348,24 @@ my $format_options = sub {
     return $raw;
 };
 
+my $format_aliases = sub {
+    my ($aliases) = @_;
+
+    my $raw = '';
+
+    $raw .= "[ALIASES]\n\n";
+    foreach my $k (keys %$aliases) {
+	my $e = $aliases->{$k};
+	$raw .= "$e->{name} $e->{cidr}";
+	$raw .= " # " . encode('utf8', $e->{comment})
+	    if $e->{comment} && $e->{comment} !~ m/^\s*$/;
+	$raw .= "\n";
+    }
+    $raw .= "\n";
+
+    return $raw;
+};
+
 my $format_ipset = sub {
     my ($options) = @_;
 
@@ -2298,7 +2384,7 @@ my $format_ipset = sub {
 	    if $entry->{comment} && $entry->{comment} !~ m/^\s*$/;
 	$raw .= "$line\n";
     }
- 
+
     return $raw;
 };
 
@@ -2310,7 +2396,10 @@ sub save_vmfw_conf {
     my $options = $vmfw_conf->{options};
     $raw .= &$format_options($options) if scalar(keys %$options);
 
-    my $rules = $vmfw_conf->{rules};
+    my $aliases = $vmfw_conf->{aliases};
+    $raw .= &$format_aliases($aliases) if scalar(keys %$aliases);
+
+    my $rules = $vmfw_conf->{rules} || [];
     if (scalar(@$rules)) {
 	$raw .= "[RULES]\n\n";
 	$raw .= &$format_rules($rules, 1);
@@ -2322,11 +2411,12 @@ sub save_vmfw_conf {
 }
 
 sub read_vm_firewall_configs {
-    my ($vmdata) = @_;
+    my ($vmdata, $dir) = @_;
+
     my $vmfw_configs = {};
 
     foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) {
-	my $vmfw_conf = load_vmfw_conf($vmid);
+	my $vmfw_conf = load_vmfw_conf($vmid, $dir);
 	next if !$vmfw_conf->{options}; # skip if file does not exists
 	$vmfw_configs->{$vmid} = $vmfw_conf;
     }
@@ -2408,12 +2498,17 @@ sub generate_ipset {
     my $nethash = {};
     foreach my $entry (@$options) {
 	my $cidr = $entry->{cidr};
-	#check aliases
-	if ($cidr =~ m/^${security_group_pattern}$/){
-	    die "no such alias $cidr" if !$aliases->{$cidr};
-	    $entry->{cidr} = $aliases->{$cidr};
+	if ($cidr =~ m/^${ip_alias_pattern}$/) {
+	    my $alias = lc($cidr);
+	    if ($aliases->{$alias}) {
+		$entry->{cidr} = $aliases->{$alias}->{cidr};
+		$nethash->{$entry->{cidr}} = $entry;
+	    } else {
+		warn "no such alias '$cidr'\n" if !$aliases->{$alias};
+	    }
+	} else {
+	    $nethash->{$entry->{cidr}} = $entry;
 	}
-	$nethash->{$entry->{cidr}} = $entry;
     }
 
     foreach my $cidr (sort keys %$nethash) {
@@ -2440,63 +2535,14 @@ sub round_powerof2 {
     return ++$int;
 }
 
-sub save_pvefw_status {
-    my ($status) = @_;
-
-    die "unknown status '$status' - internal error"
-	if $status !~ m/^(stopped|active)$/;
-
-    mkdir dirname($pve_fw_status_filename);
-    PVE::Tools::file_set_contents($pve_fw_status_filename, $status);
-}
-
-sub read_pvefw_status {
-
-    my $status = 'unknown';
-
-    return 'stopped' if ! -f $pve_fw_status_filename;
-
-    eval {
-	$status = PVE::Tools::file_get_contents($pve_fw_status_filename);
-    };
-    warn $@ if $@;
-
-    return $status;
-}
-
-# fixme: move to pve-common PVE::ProcFSTools
-sub read_proc_net_route {
-    my $filename = "/proc/net/route";
-
-    my $res = {};
-
-    my $fh = IO::File->new ($filename, "r");
-    return $res if !$fh;
-
-    my $int_to_quad = sub {
-	return join '.' => map { ($_[0] >> 8*(3-$_)) % 256 } (3, 2, 1, 0);
-    };
-
-    while (defined(my $line = <$fh>)) {
-	next if $line =~/^Iface\s+Destination/; # skip head
-	my ($iface, $dest, $gateway, $metric, $mask, $mtu) = (split(/\s+/, $line))[0,1,2,6,7,8];
-	push @{$res->{$iface}}, {
-	    dest => &$int_to_quad(hex($dest)),
-	    gateway => &$int_to_quad(hex($gateway)),
-	    mask => &$int_to_quad(hex($mask)),
-	    metric => $metric,
-	    mtu => $mtu,
-	};
-    }
-
-    return $res;
-}
-
 sub load_clusterfw_conf {
+    my ($filename) = @_;
+
+    $filename = $clusterfw_conf_filename if !defined($filename);
 
     my $cluster_conf = {};
-     if (my $fh = IO::File->new($clusterfw_conf_filename, O_RDONLY)) {
-	$cluster_conf = parse_cluster_fw_rules($clusterfw_conf_filename, $fh);
+    if (my $fh = IO::File->new($filename, O_RDONLY)) {
+	$cluster_conf = parse_cluster_fw_rules($filename, $fh);
     }
 
     return $cluster_conf;
@@ -2510,6 +2556,9 @@ sub save_clusterfw_conf {
     my $options = $cluster_conf->{options};
     $raw .= &$format_options($options) if scalar(keys %$options);
 
+    my $aliases = $cluster_conf->{aliases};
+    $raw .= &$format_aliases($aliases) if scalar(keys %$aliases);
+
     foreach my $ipset (sort keys %{$cluster_conf->{ipset}}) {
 	if (my $comment = $cluster_conf->{ipset_comments}->{$ipset}) {
 	    my $utf8comment = encode('utf8', $comment);
@@ -2546,10 +2595,13 @@ sub save_clusterfw_conf {
 }
 
 sub load_hostfw_conf {
+    my ($filename) = @_;
+
+    $filename = $hostfw_conf_filename if !defined($filename);
 
     my $hostfw_conf = {};
-    if (my $fh = IO::File->new($hostfw_conf_filename, O_RDONLY)) {
-	$hostfw_conf = parse_host_fw_rules($hostfw_conf_filename, $fh);
+    if (my $fh = IO::File->new($filename, O_RDONLY)) {
+	$hostfw_conf = parse_host_fw_rules($filename, $fh);
     }
     return $hostfw_conf;
 }
@@ -2573,21 +2625,41 @@ sub save_hostfw_conf {
 }
 
 sub compile {
-    my ($cluster_conf, $hostfw_conf) = @_;
+    my ($cluster_conf, $hostfw_conf, $vmdata) = @_;
 
-    $cluster_conf = load_clusterfw_conf() if !$cluster_conf;
-    $hostfw_conf = load_hostfw_conf() if !$hostfw_conf;
+    my $vmfw_configs;
 
-    my $vmdata = read_local_vm_config();
-    my $vmfw_configs = read_vm_firewall_configs($vmdata);
+    if ($vmdata) { # test mode
+	my $testdir = $vmdata->{testdir} || die "no test directory specified";
+	my $filename = "$testdir/cluster.fw";
+	$cluster_conf = load_clusterfw_conf($filename);
 
-    my $routing_table = read_proc_net_route();
-    
-    my $bridges_config = read_bridges_config();
+	$filename = "$testdir/host.fw";
+	$hostfw_conf = load_hostfw_conf($filename);
 
-    my $ipset_ruleset = {};
-    generate_ipset_chains($ipset_ruleset, $cluster_conf);
+	$vmfw_configs = read_vm_firewall_configs($vmdata, $testdir);
+    } else { # normal operation
+	$cluster_conf = load_clusterfw_conf() if !$cluster_conf;
+
+	$hostfw_conf = load_hostfw_conf() if !$hostfw_conf;
+
+	$vmdata = read_local_vm_config();
+	$vmfw_configs = read_vm_firewall_configs($vmdata);
+    }
 
+
+    $cluster_conf->{ipset}->{venet0} = [];
+ 
+    my $localnet;
+    if ($cluster_conf->{aliases}->{local_network}) {
+	$localnet = $cluster_conf->{aliases}->{local_network}->{cidr};
+    } else {
+	$localnet = local_network() || '127.0.0.0/8';
+	$cluster_conf->{aliases}->{local_network} = { cidr => $localnet };
+    }
+
+    push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet };
+   
     my $ruleset = {};
 
     ruleset_create_chain($ruleset, "PVEFW-INPUT");
@@ -2597,98 +2669,112 @@ sub compile {
 
     my $hostfw_options = $hostfw_conf->{options} || {};
 
-    generate_std_chains($ruleset, $hostfw_options);
+    # fixme: what log level should we use here?
+    my $loglevel = get_option_log_level($hostfw_options, "log_level_out");
 
-    my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0));
+    ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", "ACCEPT");
 
-    enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf) if $hostfw_enable;
+    ruleset_create_chain($ruleset, "PVEFW-VENET-OUT");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -m set --match-set PVEFW-venet0 src -j PVEFW-VENET-OUT");
+    ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -m set --match-set PVEFW-venet0 src -j PVEFW-VENET-OUT");
 
-    # generate firewall rules for QEMU VMs
-    foreach my $vmid (keys %{$vmdata->{qemu}}) {
-	my $conf = $vmdata->{qemu}->{$vmid};
-	my $vmfw_conf = $vmfw_configs->{$vmid};
-	next if !$vmfw_conf;
-	next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);
+    ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
+    ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $hostfw_options, $cluster_conf, $loglevel);
 
-	foreach my $netid (keys %$conf) {
-	    next if $netid !~ m/^net(\d+)$/;
-	    my $net = PVE::QemuServer::parse_net($conf->{$netid});
-	    next if !$net;
-	    my $iface = "tap${vmid}i$1";
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-in fwln+ -j PVEFW-FWBR-IN");
 
-	    my $bridge = $net->{bridge};
-	    next if !$bridge; # fixme: ?
+    ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT");
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT");
 
-	    $bridge .= "v$net->{tag}" if $net->{tag};
+    ruleset_create_chain($ruleset, "PVEFW-VENET-IN");
+    ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN", $hostfw_options, $cluster_conf, $loglevel);
 
-	    generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table, $bridges_config);
+    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o venet0 -m set --match-set PVEFW-venet0 dst -j PVEFW-VENET-IN");
 
-	    my $macaddr = $net->{macaddr};
-	    generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					 $vmfw_conf, $vmid, $bridge, 'IN');
-	    generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					 $vmfw_conf, $vmid, $bridge, 'OUT');
-	}
+    generate_std_chains($ruleset, $hostfw_options);
+
+    my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0));
+
+    if ($hostfw_enable) {
+	eval { enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf); };
+	warn $@ if $@; # just to be sure - should not happen
+    }
+
+    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-o venet0 -m set --match-set PVEFW-venet0 dst -j PVEFW-VENET-IN");
+
+    # generate firewall rules for QEMU VMs
+    foreach my $vmid (keys %{$vmdata->{qemu}}) {
+	eval {
+	    my $conf = $vmdata->{qemu}->{$vmid};
+	    my $vmfw_conf = $vmfw_configs->{$vmid};
+	    return if !$vmfw_conf;
+	    return if !$vmfw_conf->{options}->{enable};
+
+	    foreach my $netid (keys %$conf) {
+		next if $netid !~ m/^net(\d+)$/;
+		my $net = PVE::QemuServer::parse_net($conf->{$netid});
+		next if !$net->{firewall};
+		my $iface = "tap${vmid}i$1";
+
+		my $macaddr = $net->{macaddr};
+		generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+					     $vmfw_conf, $vmid, 'IN');
+		generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+					     $vmfw_conf, $vmid, 'OUT');
+	    }
+	};
+	warn $@ if $@; # just to be sure - should not happen
     }
 
     # generate firewall rules for OpenVZ containers
     foreach my $vmid (keys %{$vmdata->{openvz}}) {
-	my $conf = $vmdata->{openvz}->{$vmid};
-
-	my $vmfw_conf = $vmfw_configs->{$vmid};
-	next if !$vmfw_conf;
-	next if defined($vmfw_conf->{options}->{enable}) && ($vmfw_conf->{options}->{enable} == 0);
-
-	if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
-	    my $ip = $conf->{ip_address}->{value};
-	    generate_venet_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, 'IN');
-	    generate_venet_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $vmfw_conf, $vmid, $ip, 'OUT');
-	}
-
-	if ($conf->{netif} && $conf->{netif}->{value}) {
-	    my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value});
-	    foreach my $netid (keys %$netif) {
-		my $d = $netif->{$netid};
-		my $bridge = $d->{bridge};
-		if (!$bridge) {
-		    warn "no bridge device for CT $vmid iface '$netid'\n";
-		    next; # fixme?
-		}
+	eval {
+	    my $conf = $vmdata->{openvz}->{$vmid};
 
-		generate_bridge_chains($ruleset, $hostfw_conf, $bridge, $routing_table, $bridges_config);
+	    my $vmfw_conf = $vmfw_configs->{$vmid};
+	    return if !$vmfw_conf;
+	    return if !$vmfw_conf->{options}->{enable};
 
-		my $macaddr = $d->{mac};
-		my $iface = $d->{host_ifname};
-		generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					     $vmfw_conf, $vmid, $bridge, 'IN');
-		generate_tap_rules_direction($ruleset, $cluster_conf, $hostfw_conf, $iface, $netid, $macaddr,
-					     $vmfw_conf, $vmid, $bridge, 'OUT');
-	    }
-	}
-    }
+	    if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
+		my $ip = $conf->{ip_address}->{value};
+		$ip =~ s/\s+/,/g;
+		parse_address_list($ip); # make sure we have a valid $ip list
 
-    if($hostfw_options->{optimize}){
+		my @ips = split(',', $ip);
 
-	my $accept = ruleset_chain_exist($ruleset, "PVEFW-IPS") ? "PVEFW-IPS" : "ACCEPT";
-	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j $accept");
-	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate INVALID -j DROP");
-    }
+		foreach my $singleip (@ips) {
+		    my $venet0ipset = {};
+		    $venet0ipset->{cidr} = $singleip;
+		    push @{$cluster_conf->{ipset}->{venet0}}, $venet0ipset;
+		}
 
-    # fixme: what log level should we use here?
-    my $loglevel = get_option_log_level($hostfw_options, "log_level_out");
+		generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'IN');
+		generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, 'OUT');
+	    }
 
-    # fixme: should we really block inter-bridge traffic?
+	    if ($conf->{netif} && $conf->{netif}->{value}) {
+		my $netif = PVE::OpenVZ::parse_netif($conf->{netif}->{value});
+		foreach my $netid (keys %$netif) {
+		    my $d = $netif->{$netid};
+
+		    my $macaddr = $d->{mac};
+		    my $iface = $d->{host_ifname};
+		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+						 $vmfw_conf, $vmid, 'IN');
+		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+						 $vmfw_conf, $vmid, 'OUT');
+		}
+	    }
+	};
+	warn $@ if $@; # just to be sure - should not happen
+    }
 
-    # always allow traffic from containers?
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -j RETURN");
+    if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){
+	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
+    }
 
-    # disable interbridge routing
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j PVEFW-Drop");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j PVEFW-Drop");
-    ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-o vmbr+");
-    ruleset_addlog($ruleset, "PVEFW-FORWARD", 0, "DROP: ", $loglevel, "-i vmbr+");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o vmbr+ -j DROP");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i vmbr+ -j DROP");
+    my $ipset_ruleset = {};
+    generate_ipset_chains($ipset_ruleset, $cluster_conf);
 
     return ($ruleset, $ipset_ruleset);
 }
@@ -2809,7 +2895,7 @@ sub get_ipset_cmdlist {
     my $active_chains = ipset_get_chains();
     my $statushash = get_ruleset_status($ruleset, $active_chains, \&ipset_chain_digest, $verbose);
 
-    # remove stale _swap chains 
+    # remove stale _swap chains
     foreach my $chain (keys %$active_chains) {
 	if ($chain =~ m/^PVEFW-\S+_swap$/) {
 	    $cmdlist .= "destroy $chain\n";
@@ -2857,10 +2943,6 @@ sub apply_ruleset {
 
     enable_bridge_firewall();
 
-    update_nf_conntrack_max($hostfw_conf);
-
-    update_nf_conntrack_tcp_timeout_established($hostfw_conf);
-
     my ($ipset_create_cmdlist, $ipset_delete_cmdlist, $ipset_changes) =
 	get_ipset_cmdlist($ipset_ruleset, undef, $verbose);
 
@@ -2899,6 +2981,11 @@ sub apply_ruleset {
     }
 
     die "unable to apply firewall changes\n" if $errors;
+
+    update_nf_conntrack_max($hostfw_conf);
+
+    update_nf_conntrack_tcp_timeout_established($hostfw_conf);
+
 }
 
 sub update_nf_conntrack_max {
@@ -2958,8 +3045,18 @@ sub remove_pvefw_chains {
     iptables_restore_cmdlist($cmdlist);
 }
 
+sub init {
+    my $cluster_conf = load_clusterfw_conf();
+    my $cluster_options = $cluster_conf->{options};
+    my $enable = $cluster_options->{enable};
+
+    return if !$enable;
+
+    # load required modules here
+}
+
 sub update {
-    my ($start, $verbose) = @_;
+    my ($verbose) = @_;
 
     my $code = sub {
 
@@ -2968,9 +3065,7 @@ sub update {
 
 	my $enable = $cluster_options->{enable};
 
-	my $status = read_pvefw_status();
-
-	die "Firewall is disabled - cannot start\n" if !$enable && $start;
+	die "Firewall is disabled - cannot start\n" if !$enable;
 
 	if (!$enable) {
 	    PVE::Firewall::remove_pvefw_chains();
@@ -2982,18 +3077,10 @@ sub update {
 
 	my ($ruleset, $ipset_ruleset) = compile($cluster_conf, $hostfw_conf);
 
-	if ($start || $status eq 'active') {
-
-	    save_pvefw_status('active')	if ($status ne 'active');
-
-	    apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose);
-	} else {
-	    print "Firewall not active (status = $status)\n" if $verbose;
-	}
+	apply_ruleset($ruleset, $hostfw_conf, $ipset_ruleset, $verbose);
     };
 
     run_locked($code);
 }
 
-
 1;