X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FFirewall.pm;h=a7faeaf40499cbebf840ca7d321acc9e870b80ca;hb=a7c85d5667b209f90295a1a1200b1ca24a4903c1;hp=df0ebb6e086f80390c568beb517bc06abdded5ce;hpb=ff5363da02896a37be1f9e71f3df0e7d7c68a196;p=pve-firewall.git

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index df0ebb6..a7faeaf 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -23,7 +23,7 @@ my $hostfw_conf_filename = "/etc/pve/local/host.fw";
 my $pvefw_conf_dir = "/etc/pve/firewall";
 my $clusterfw_conf_filename = "$pvefw_conf_dir/cluster.fw";
 
-# dynamically include PVE::QemuServer and PVE::OpenVZ
+# dynamically include PVE::QemuServer and PVE::LXC
 # to avoid dependency problems
 my $have_qemu_server;
 eval {
@@ -31,12 +31,13 @@ eval {
     $have_qemu_server = 1;
 };
 
-my $have_pve_manager;
+my $have_lxc;
 eval {
-    require PVE::OpenVZ;
-    $have_pve_manager = 1;
+    require PVE::LXC;
+    $have_lxc = 1;
 };
 
+
 my $pve_fw_status_dir = "/var/lib/pve-firewall";
 
 mkdir $pve_fw_status_dir; # make sure this exists
@@ -113,8 +114,6 @@ eval  {
 
 };
 
-use Data::Dumper;
-
 my $nodename = PVE::INotify::nodename();
 
 my $pve_fw_lock_filename = "/var/lock/pvefw.lck";
@@ -132,6 +131,27 @@ my $log_level_hash = {
     emerg => 0,
 };
 
+# we need to overwrite some macros for ipv6
+my $pve_ipv6fw_macros = {
+    'Ping' => [
+	{ action => 'PARAM', proto => 'icmpv6', dport => 'echo-request' },
+    ],
+    'NeighborDiscovery' => [
+	"IPv6 neighbor solicitation, neighbor and router advertisement",
+	{ action => 'PARAM', proto => 'icmpv6', dport => 'router-solicitation' },
+	{ action => 'PARAM', proto => 'icmpv6', dport => 'router-advertisement' },
+	{ action => 'PARAM', proto => 'icmpv6', dport => 'neighbor-solicitation' },
+	{ action => 'PARAM', proto => 'icmpv6', dport => 'neighbor-advertisement' },
+    ],
+    'DHCPv6' => [
+	{ action => 'PARAM', proto => 'udp', dport => '546:547', sport => '546:547' },
+    ],
+    'Trcrt' => [
+	{ action => 'PARAM', proto => 'udp', dport => '33434:33524' },
+	{ action => 'PARAM', proto => 'icmpv6', dport => 'echo-request' },
+    ],
+ };
+
 # imported/converted from: /usr/share/shorewall/macro.*
 my $pve_fw_macros = {
     'Amanda' => [
@@ -157,6 +177,11 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'tcp', dport => '6881:6999' },
 	{ action => 'PARAM', proto => 'udp', dport => '6881' },
     ],
+    'Ceph' => [
+        "Ceph Storage Cluster traffic (Ceph Monitors, OSD & MDS Deamons)",
+        { action => 'PARAM', proto => 'tcp', dport => '6789' },
+        { action => 'PARAM', proto => 'tcp', dport => '6800:7300' },
+    ],
     'CVS' => [
 	"Concurrent Versions System pserver traffic",
 	{ action => 'PARAM', proto => 'tcp', dport => '2401' },
@@ -486,6 +511,7 @@ my $pve_fw_macros = {
 
 my $pve_fw_parsed_macros;
 my $pve_fw_macro_descr;
+my $pve_fw_macro_ipversion = {};
 my $pve_fw_preferred_macro_names = {};
 
 my $pve_std_chains = {};
@@ -570,7 +596,7 @@ $pve_std_chains->{4} = {
     'PVEFW-smurfs' => [
 	# same as shorewall smurfs action
 	# Filter packets for smurfs (packets with a broadcast address as the source).
-	"-s 0.0.0.0/32 -j RETURN",
+	"-s 0.0.0.0/32 -j RETURN", # allow DHCP
 	"-m addrtype --src-type BROADCAST -g PVEFW-smurflog",
 	"-s 224.0.0.0/4 -g PVEFW-smurflog",
     ],
@@ -724,7 +750,9 @@ my $icmpv6_type_names = {
     'echo-reply' => 1,
     'router-solicitation' => 1,
     'router-advertisement' => 1,
+    'neighbor-solicitation' => 1,
     'neighbour-solicitation' => 1,
+    'neighbor-advertisement' => 1,
     'neighbour-advertisement' => 1,
     'redirect' => 1,
 };
@@ -733,14 +761,32 @@ sub init_firewall_macros {
 
     $pve_fw_parsed_macros = {};
 
-    foreach my $k (keys %$pve_fw_macros) {
+    my $parse = sub {
+	my ($k, $macro) = @_;
 	my $lc_name = lc($k);
-	my $macro = $pve_fw_macros->{$k};
-	if (!ref($macro->[0])) {
-	    $pve_fw_macro_descr->{$k} = shift @$macro;
+	$pve_fw_macro_ipversion->{$k} = 0;
+	while (!ref($macro->[0])) {
+	    my $desc = shift @$macro;
+	    if ($desc eq 'ipv4only') {
+		$pve_fw_macro_ipversion->{$k} = 4;
+	    } elsif ($desc eq 'ipv6only') {
+		$pve_fw_macro_ipversion->{$k} = 6;
+	    } else {
+		$pve_fw_macro_descr->{$k} = $desc;
+	    }
 	}
 	$pve_fw_preferred_macro_names->{$lc_name} = $k;
 	$pve_fw_parsed_macros->{$k} = $macro;
+    };
+
+    foreach my $k (keys %$pve_fw_macros) {
+	&$parse($k, $pve_fw_macros->{$k});
+    }
+
+    foreach my $k (keys %$pve_ipv6fw_macros) {
+	next if $pve_fw_parsed_macros->{$k};
+	&$parse($k, $pve_ipv6fw_macros->{$k});
+	$pve_fw_macro_ipversion->{$k} = 6;
     }
 }
 
@@ -858,14 +904,20 @@ sub local_network {
 
 	my $testip = Net::IP->new($ip);
 
-	my $routes = PVE::ProcFSTools::read_proc_net_route();
+	my $isv6 = $testip->version == 6;
+	my $routes = $isv6 ? PVE::ProcFSTools::read_proc_net_ipv6_route()
+	                   : 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 $mask;
+	    if ($isv6) {
+		$mask = $entry->{prefix};
+	    } else {
+		$mask = $ipv4_mask_hash_localnet->{$entry->{mask}};
+		next if !defined($mask);
+	    }
 	    my $cidr = "$entry->{dest}/$mask";
 	    my $testnet = Net::IP->new($cidr);
-	    if ($testnet->overlaps($testip)) {
+	    if ($testnet->overlaps($testip) == $Net::IP::IP_B_IN_A_OVERLAP) {
 		$__local_network = $cidr;
 		return;
 	    }
@@ -943,7 +995,7 @@ sub parse_address_list {
 }
 
 sub parse_port_name_number_or_range {
-    my ($str) = @_;
+    my ($str, $dport) = @_;
 
     my $services = PVE::Firewall::get_etc_services();
     my $count = 0;
@@ -959,9 +1011,9 @@ sub parse_port_name_number_or_range {
 	    my $port = $1;
 	    die "invalid port '$port'\n" if $port > 65535;
 	} else {
-	    if ($icmp_type_names->{$item}) {
+	    if ($dport && $icmp_type_names->{$item}) {
 		$icmp_port = 1;
-	    } elsif ($icmpv6_type_names->{$item}) {
+	    } elsif ($dport && $icmpv6_type_names->{$item}) {
 		$icmp_port = 1;
 	    } else {
 		die "invalid port '$item'\n" if !$services->{byname}->{$item};
@@ -974,11 +1026,20 @@ sub parse_port_name_number_or_range {
     return $count;
 }
 
-PVE::JSONSchema::register_format('pve-fw-port-spec', \&pve_fw_verify_port_spec);
-sub pve_fw_verify_port_spec {
+PVE::JSONSchema::register_format('pve-fw-sport-spec', \&pve_fw_verify_sport_spec);
+sub pve_fw_verify_sport_spec {
    my ($portstr) = @_;
 
-   parse_port_name_number_or_range($portstr);
+   parse_port_name_number_or_range($portstr, 0);
+
+   return $portstr;
+}
+
+PVE::JSONSchema::register_format('pve-fw-dport-spec', \&pve_fw_verify_dport_spec);
+sub pve_fw_verify_dport_spec {
+   my ($portstr) = @_;
+
+   parse_port_name_number_or_range($portstr, 1);
 
    return $portstr;
 }
@@ -1041,7 +1102,10 @@ sub copy_list_with_digest {
 	    next if !defined($v);
 	    $data->{$k} = $v;
 	    # Note: digest ignores refs ($rule->{errors})
-	    $sha->add($k, ':', $v, "\n") if !ref($v); ;
+	    # since Digest::SHA expects a series of bytes,
+	    #  we have to encode the value here to prevent errors when
+	    #  using utf8 characters (eg. in comments)
+	    $sha->add($k, ':', encode_utf8($v), "\n") if !ref($v); ;
 	}
 	push @$res, $data;
     }
@@ -1095,15 +1159,16 @@ my $rule_properties = {
 	optional => 1,
     },
     enable => {
-	type => 'boolean',
+        type => 'integer',
+	minimum => 0,
 	optional => 1,
     },
     sport => {
-	type => 'string', format => 'pve-fw-port-spec',
+	type => 'string', format => 'pve-fw-sport-spec',
 	optional => 1,
     },
     dport => {
-	type => 'string', format => 'pve-fw-port-spec',
+	type => 'string', format => 'pve-fw-dport-spec',
 	optional => 1,
     },
     comment => {
@@ -1139,11 +1204,20 @@ sub delete_rule_properties {
 }
 
 my $apply_macro = sub {
-    my ($macro_name, $param, $verify) = @_;
+    my ($macro_name, $param, $verify, $ipversion) = @_;
 
     my $macro_rules = $pve_fw_parsed_macros->{$macro_name};
     die "unknown macro '$macro_name'\n" if !$macro_rules; # should not happen
 
+    if ($ipversion && ($ipversion == 6) && $pve_ipv6fw_macros->{$macro_name}) {
+	$macro_rules = $pve_ipv6fw_macros->{$macro_name};
+    }
+
+    # skip macros which are specific to another ipversion
+    if ($ipversion && (my $required = $pve_fw_macro_ipversion->{$macro_name})) {
+	return if $ipversion != $required;
+    }
+
     my $rules = [];
 
     foreach my $templ (@$macro_rules) {
@@ -1276,12 +1350,9 @@ sub verify_rule {
 	    if !$allow_iface;
 	eval { PVE::JSONSchema::pve_verify_iface($rule->{iface}); };
 	&$add_error('iface', $@) if $@;
-    	if ($rule_env eq 'vm') {
+    	if ($rule_env eq 'vm' || $rule_env eq 'ct') {
 	    &$add_error('iface', "value does not match the regex pattern 'net\\d+'")
 		if $rule->{iface} !~  m/^net(\d+)$/;
-	} elsif ($rule_env eq 'ct') {
-	    &$add_error('iface', "value does not match the regex pattern '(venet|eth\\d+)'")
-		if $rule->{iface} !~  m/^(venet|eth(\d+))$/;
 	}
     }
 
@@ -1301,14 +1372,14 @@ sub verify_rule {
     }
 
     if ($rule->{dport}) {
-	eval { parse_port_name_number_or_range($rule->{dport}); };
+	eval { parse_port_name_number_or_range($rule->{dport}, 1); };
 	&$add_error('dport', $@) if $@;
 	&$add_error('proto', "missing property - 'dport' requires this property")
 	    if !$rule->{proto};
     }
 
     if ($rule->{sport}) {
-	eval { parse_port_name_number_or_range($rule->{sport}); };
+	eval { parse_port_name_number_or_range($rule->{sport}, 0); };
 	&$add_error('sport', $@) if $@;
 	&$add_error('proto', "missing property - 'sport' requires this property")
 	    if !$rule->{proto};
@@ -1332,8 +1403,10 @@ sub verify_rule {
 	&$check_ipset_or_alias_property('dest', $ipversion);
     }
 
+    $rule->{ipversion} = $ipversion if $ipversion;
+
     if ($rule->{macro} && !$error_count) {
-	eval { &$apply_macro($rule->{macro}, $rule, 1); };
+	eval { &$apply_macro($rule->{macro}, $rule, 1, $ipversion); };
 	if (my $err = $@) {
 	    if (ref($err) eq "PVE::Exception" && $err->{errors}) {
 		my $eh = $err->{errors};
@@ -1347,7 +1420,6 @@ sub verify_rule {
     }
 
     $rule->{errors} = $errors if $error_count;
-    $rule->{ipversion} = $ipversion if $ipversion;
 
     return $rule;
 }
@@ -1379,7 +1451,7 @@ sub rules_modify_permissions {
 	return {
 	    check => ['perm', '/', [ 'Sys.Modify' ]],
 	};
-    } elsif ($rule_env eq 'vm' ||   $rule_env eq 'ct') {
+    } elsif ($rule_env eq 'vm' || $rule_env eq 'ct') {
 	return {
 	    check => ['perm', '/vms/{vmid}', [ 'VM.Config.Network' ]],
 	}
@@ -1399,7 +1471,7 @@ sub rules_audit_permissions {
 	return {
 	    check => ['perm', '/', [ 'Sys.Audit' ]],
 	};
-    } elsif ($rule_env eq 'vm' ||   $rule_env eq 'ct') {
+    } elsif ($rule_env eq 'vm' || $rule_env eq 'ct') {
 	return {
 	    check => ['perm', '/vms/{vmid}', [ 'VM.Audit' ]],
 	}
@@ -1457,14 +1529,12 @@ sub iptables_get_chains {
 
 	return 1 if $name =~ m/^PVEFW-\S+$/;
 
-	return 1 if $name =~ m/^tap\d+i\d+-(:?IN|OUT)$/;
-
-	return 1 if $name =~ m/^veth\d+.\d+-(:?IN|OUT)$/; # fixme: dev name is configurable
+	return 1 if $name =~ m/^tap\d+i\d+-(?:IN|OUT)$/;
 
-	return 1 if $name =~ m/^venet0-\d+-(:?IN|OUT)$/;
+	return 1 if $name =~ m/^veth\d+i\d+-(?:IN|OUT)$/;
 
-	return 1 if $name =~ m/^fwbr\d+(v\d+)?-(:?FW|IN|OUT|IPS)$/;
-	return 1 if $name =~ m/^GROUP-(:?[^\s\-]+)-(:?IN|OUT)$/;
+	return 1 if $name =~ m/^fwbr\d+(v\d+)?-(?:FW|IN|OUT|IPS)$/;
+	return 1 if $name =~ m/^GROUP-(?:$security_group_name_pattern)-(?:IN|OUT)$/;
 
 	return undef;
     };
@@ -1564,8 +1634,8 @@ sub ruleset_generate_cmdstr {
 
     die "unable to emit macro - internal error" if $rule->{macro}; # should not happen
 
-    my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}) : 0;
-    my $nbsport = defined($rule->{sport}) ? parse_port_name_number_or_range($rule->{sport}) : 0;
+    my $nbdport = defined($rule->{dport}) ? parse_port_name_number_or_range($rule->{dport}, 1) : 0;
+    my $nbsport = defined($rule->{sport}) ? parse_port_name_number_or_range($rule->{sport}, 0) : 0;
 
     my @cmd = ();
 
@@ -1648,11 +1718,13 @@ sub ruleset_generate_cmdstr {
 	if ($rule->{dport}) {
 	    if ($rule->{proto} && $rule->{proto} eq 'icmp') {
 		# Note: we use dport to store --icmp-type
-		die "unknown icmp-type '$rule->{dport}'\n" if !defined($icmp_type_names->{$rule->{dport}});
+		die "unknown icmp-type '$rule->{dport}'\n"
+		    if $rule->{dport} !~ /^\d+$/ && !defined($icmp_type_names->{$rule->{dport}});
 		push @cmd, "-m icmp --icmp-type $rule->{dport}";
 	    } elsif ($rule->{proto} && $rule->{proto} eq 'icmpv6') {
 		# Note: we use dport to store --icmpv6-type
-		die "unknown icmpv6-type '$rule->{dport}'\n" if !defined($icmpv6_type_names->{$rule->{dport}});
+		die "unknown icmpv6-type '$rule->{dport}'\n"
+		    if $rule->{dport} !~ /^\d+$/ && !defined($icmpv6_type_names->{$rule->{dport}});
 		push @cmd, "-m icmpv6 --icmpv6-type $rule->{dport}";
 	    } else {
 		if ($nbdport > 1) {
@@ -1696,7 +1768,7 @@ sub ruleset_generate_rule {
     my $rules;
 
     if ($rule->{macro}) {
-	$rules = &$apply_macro($rule->{macro}, $rule);
+	$rules = &$apply_macro($rule->{macro}, $rule, 0, $ipversion);
     } else {
 	$rules = [ $rule ];
     }
@@ -1810,6 +1882,18 @@ sub ruleset_add_chain_policy {
     }
 }
 
+sub ruleset_chain_add_ndp {
+    my ($ruleset, $chain, $ipversion, $options, $direction, $accept) = @_;
+    return if $ipversion != 6 || (defined($options->{ndp}) && !$options->{ndp});
+
+    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-solicitation $accept");
+    if ($direction ne 'OUT' || $options->{radv}) {
+	ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type router-advertisement $accept");
+    }
+    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-solicitation $accept");
+    ruleset_addrule($ruleset, $chain, "-p icmpv6 --icmpv6-type neighbor-advertisement $accept");
+}
+
 sub ruleset_chain_add_conn_filters {
     my ($ruleset, $chain, $accept) = @_;
 
@@ -1848,26 +1932,45 @@ sub ruleset_create_vm_chain {
     my $accept = generate_nfqueue($options);
 
     if (!(defined($options->{dhcp}) && $options->{dhcp} == 0)) {
-	if ($direction eq 'OUT') {
-	    ruleset_generate_rule($ruleset, $chain, $ipversion, 
-				  { action => 'PVEFW-SET-ACCEPT-MARK',
-				    proto => 'udp', sport => 68, dport => 67 });
-	} else {
-	    ruleset_generate_rule($ruleset, $chain, $ipversion,
-				  { action => 'ACCEPT',
-				    proto => 'udp', sport => 67, dport => 68 });
+	if ($ipversion == 4) {
+	    if ($direction eq 'OUT') {
+		ruleset_generate_rule($ruleset, $chain, $ipversion, 
+				      { action => 'PVEFW-SET-ACCEPT-MARK',
+					proto => 'udp', sport => 68, dport => 67 });
+	    } else {
+		ruleset_generate_rule($ruleset, $chain, $ipversion,
+				      { action => 'ACCEPT',
+					proto => 'udp', sport => 67, dport => 68 });
+	    }
+	} elsif ($ipversion == 6) {
+	    if ($direction eq 'OUT') {
+		ruleset_generate_rule($ruleset, $chain, $ipversion,
+				      { action => 'PVEFW-SET-ACCEPT-MARK',
+					proto => 'udp', sport => 546, dport => 547 });
+	    } else {
+		ruleset_generate_rule($ruleset, $chain, $ipversion,
+				      { action => 'ACCEPT',
+					proto => 'udp', sport => 547, dport => 546 });
+	    }
 	}
+
     }
 
     if ($direction eq 'OUT') {
 	if (defined($macaddr) && !(defined($options->{macfilter}) && $options->{macfilter} == 0)) {
 	    ruleset_addrule($ruleset, $chain, "-m mac ! --mac-source $macaddr -j DROP");
 	}
+	if ($ipversion == 6 && !$options->{radv}) {
+	    ruleset_addrule($ruleset, $chain, '-p icmpv6 --icmpv6-type router-advertisement -j DROP');
+	}
 	if ($ipfilter_ipset) {
 	    ruleset_addrule($ruleset, $chain, "-m set ! --match-set $ipfilter_ipset src -j DROP");
 	}
 	ruleset_addrule($ruleset, $chain, "-j MARK --set-mark 0"); # clear mark
     }
+
+    my $accept_action = $direction eq 'OUT' ? '-g PVEFW-SET-ACCEPT-MARK' : "-j $accept";
+    ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, $direction, $accept_action);
 }
 
 sub ruleset_add_group_rule {
@@ -1956,48 +2059,6 @@ sub ruleset_generate_vm_ipsrules {
     }
 }
 
-sub generate_venet_rules_direction {
-    my ($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip, $direction, $ipversion) = @_;
-
-    my $lc_direction = lc($direction);
-
-    my $rules = $vmfw_conf->{rules};
-
-    my $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, $ipversion, $options, undef, undef, $direction);
-
-    ruleset_generate_vm_rules($ruleset, $rules, $cluster_conf, $vmfw_conf, $chain, 'venet', $direction, undef, $ipversion);
-
-    # implement policy
-    my $policy;
-
-    if ($direction eq 'OUT') {
-	$policy = $options->{policy_out} || 'ACCEPT'; # allow everything by default
-    } else {
-	$policy = $options->{policy_in} || 'DROP'; # allow nothing by default
-    }
-
-    my $accept = generate_nfqueue($options);
-    my $accept_action = $direction eq 'OUT' ? "PVEFW-SET-ACCEPT-MARK" : $accept;
-    ruleset_add_chain_policy($ruleset, $chain, $ipversion, $vmid, $policy, $loglevel, $accept_action);
-
-    if ($direction eq 'OUT') {
-	ruleset_generate_rule_insert($ruleset, "PVEFW-VENET-OUT", $ipversion, {
-	    action => $chain,
-	    source => $ip,
-	    iface_in => 'venet0'});
-    } else {
-	ruleset_generate_rule($ruleset, "PVEFW-VENET-IN", $ipversion, {
-	    action => $chain,
-	    dest => $ip,
-	    iface_out => 'venet0'});
-    }
-}
-
 sub generate_tap_rules_direction {
     my ($ruleset, $cluster_conf, $iface, $netid, $macaddr, $vmfw_conf, $vmid, $direction, $ipversion) = @_;
 
@@ -2012,7 +2073,7 @@ sub generate_tap_rules_direction {
 
     my $ipfilter_name = compute_ipfilter_ipset_name($netid);
     my $ipfilter_ipset = compute_ipset_chain_name($vmid, $ipfilter_name, $ipversion)
-	if $vmfw_conf->{ipset}->{$ipfilter_name};	
+	if $options->{ipfilter} || $vmfw_conf->{ipset}->{$ipfilter_name};
 
     # create chain with mac and ip filter
     ruleset_create_vm_chain($ruleset, $tapchain, $ipversion, $options, $macaddr, $ipfilter_ipset, $direction);
@@ -2066,6 +2127,7 @@ sub enable_host_firewall {
     ruleset_addrule($ruleset, $chain, "-i lo -j ACCEPT");
 
     ruleset_chain_add_conn_filters($ruleset, $chain, 'ACCEPT');
+    ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'IN', '-j RETURN');
     ruleset_chain_add_input_filters($ruleset, $chain, $ipversion, $options, $cluster_conf, $loglevel);
 
     # we use RETURN because we need to check also tap rules
@@ -2076,6 +2138,7 @@ sub enable_host_firewall {
     # add host rules first, so that cluster wide rules can be overwritten
     foreach my $rule (@$rules, @$cluster_rules) {
 	next if !$rule->{enable} || $rule->{errors};
+	next if $rule->{ipversion} && ($rule->{ipversion} != $ipversion);
 
 	$rule->{iface_in} = $rule->{iface} if $rule->{iface};
 
@@ -2100,10 +2163,11 @@ sub enable_host_firewall {
     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();
+    my $localnet = $cluster_conf->{aliases}->{local_network}->{cidr};
+    my $localnet_ver = $cluster_conf->{aliases}->{local_network}->{ipversion};
 
     # corosync
-    if ($localnet) {
+    if ($localnet && ($ipversion == $localnet_ver)) {
 	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");
@@ -2125,12 +2189,14 @@ sub enable_host_firewall {
 
     # we use RETURN because we may want to check other thigs later
     $accept_action = 'RETURN';
+    ruleset_chain_add_ndp($ruleset, $chain, $ipversion, $options, 'OUT', "-j $accept_action");
 
     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->{enable} || $rule->{errors};
+	next if $rule->{ipversion} && ($rule->{ipversion} != $ipversion);
 
 	$rule->{iface_out} = $rule->{iface} if $rule->{iface};
 	eval {
@@ -2147,7 +2213,7 @@ sub enable_host_firewall {
     }
 
     # allow standard traffic on cluster network
-    if ($localnet) {
+    if ($localnet && ($ipversion == $localnet_ver)) {
 	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
@@ -2294,7 +2360,7 @@ sub parse_vmfw_option {
 
     my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog";
 
-    if ($line =~ m/^(enable|dhcp|macfilter|ips):\s*(0|1)\s*$/i) {
+    if ($line =~ m/^(enable|dhcp|ndp|radv|macfilter|ipfilter|ips):\s*(0|1)\s*$/i) {
 	$opt = lc($1);
 	$value = int($2);
     } elsif ($line =~ m/^(log_level_in|log_level_out):\s*(($loglevels)\s*)?$/i) {
@@ -2320,7 +2386,7 @@ sub parse_hostfw_option {
 
     my $loglevels = "emerg|alert|crit|err|warning|notice|info|debug|nolog";
 
-    if ($line =~ m/^(enable|nosmurfs|tcpflags):\s*(0|1)\s*$/i) {
+    if ($line =~ m/^(enable|nosmurfs|tcpflags|ndp):\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) {
@@ -2341,9 +2407,12 @@ sub parse_clusterfw_option {
 
     my ($opt, $value);
 
-    if ($line =~ m/^(enable):\s*(0|1)\s*$/i) {
+    if ($line =~ m/^(enable):\s*(\d+)\s*$/i) {
 	$opt = lc($1);
 	$value = int($2);
+	if (($value > 1) && ((time() - $value) > 60)) {
+	    $value = 0
+	}
     } elsif ($line =~ m/^(policy_(in|out)):\s*(ACCEPT|DROP|REJECT)\s*$/i) {
 	$opt = lc($1);
 	$value = uc($3);
@@ -2622,10 +2691,10 @@ sub run_locked {
 
 sub read_local_vm_config {
 
-    my $openvz = {};
     my $qemu = {};
+    my $lxc = {};
 
-    my $vmdata = { openvz => $openvz, qemu => $qemu };
+    my $vmdata = { qemu => $qemu, lxc => $lxc };
 
     my $vmlist = PVE::Cluster::get_vmlist();
     return $vmdata if !$vmlist || !$vmlist->{ids};
@@ -2636,21 +2705,21 @@ sub read_local_vm_config {
 	my $d = $ids->{$vmid};
 	next if !$d->{node} || $d->{node} ne $nodename;
 	next if !$d->{type};
-	if ($d->{type} eq 'openvz') {
-	    if ($have_pve_manager) {
-		my $cfspath = PVE::OpenVZ::cfs_config_path($vmid);
-		if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
-		    $openvz->{$vmid} = $conf;
-		}
-	    }
-	} elsif ($d->{type} eq 'qemu') {
+	if ($d->{type} eq 'qemu') {
 	    if ($have_qemu_server) {
 		my $cfspath = PVE::QemuServer::cfs_config_path($vmid);
 		if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
 		    $qemu->{$vmid} = $conf;
 		}
 	    }
-	}
+        } elsif ($d->{type} eq 'lxc') {
+            if ($have_lxc) {
+                my $cfspath = PVE::LXC::Config->cfs_config_path($vmid);
+                if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
+                    $lxc->{$vmid} = $conf;
+                }
+            }
+        }
     }
 
     return $vmdata;
@@ -2795,10 +2864,36 @@ sub save_vmfw_conf {
 	$raw .= "\n";
     }
 
-    mkdir $pvefw_conf_dir;
-
     my $filename = "$pvefw_conf_dir/$vmid.fw";
-    PVE::Tools::file_set_contents($filename, $raw);
+    if ($raw) {
+	mkdir $pvefw_conf_dir;
+	PVE::Tools::file_set_contents($filename, $raw);
+    } else {
+	unlink $filename;
+    }
+}
+
+sub remove_vmfw_conf {
+    my ($vmid) = @_;
+
+    my $vmfw_conffile = "$pvefw_conf_dir/$vmid.fw";
+
+    unlink $vmfw_conffile;
+}
+
+sub clone_vmfw_conf {
+    my ($vmid, $newid) = @_;
+
+    my $sourcevm_conffile = "$pvefw_conf_dir/$vmid.fw";
+    my $clonevm_conffile = "$pvefw_conf_dir/$newid.fw";
+
+    if (-f $clonevm_conffile) {
+	unlink $clonevm_conffile;
+    }
+    if (-f $sourcevm_conffile) {
+	my $data = PVE::Tools::file_get_contents($sourcevm_conffile);
+	PVE::Tools::file_set_contents($clonevm_conffile, $data);
+    }
 }
 
 sub read_vm_firewall_configs {
@@ -2811,10 +2906,10 @@ sub read_vm_firewall_configs {
 	next if !$vmfw_conf->{options}; # skip if file does not exists
 	$vmfw_configs->{$vmid} = $vmfw_conf;
     }
-    foreach my $vmid (keys %{$vmdata->{openvz}}) {
-	my $vmfw_conf = load_vmfw_conf($cluster_conf, 'ct', $vmid, $dir, $verbose);
-	next if !$vmfw_conf->{options}; # skip if file does not exists
-	$vmfw_configs->{$vmid} = $vmfw_conf;
+    foreach my $vmid (keys %{$vmdata->{lxc}}) {
+        my $vmfw_conf = load_vmfw_conf($cluster_conf, 'ct', $vmid, $dir, $verbose);
+        next if !$vmfw_conf->{options}; # skip if file does not exists
+        $vmfw_configs->{$vmid} = $vmfw_conf;
     }
 
     return $vmfw_configs;
@@ -2877,11 +2972,17 @@ sub generate_std_chains {
 }
 
 sub generate_ipset_chains {
-    my ($ipset_ruleset, $clusterfw_conf, $fw_conf) = @_; #fixme
+    my ($ipset_ruleset, $clusterfw_conf, $fw_conf, $device_ips, $ipsets) = @_;
 
-    foreach my $ipset (keys %{$fw_conf->{ipset}}) {
+    foreach my $ipset (keys %{$ipsets}) {
 
-	my $options = $fw_conf->{ipset}->{$ipset};
+	my $options = $ipsets->{$ipset};
+
+	if ($device_ips && $ipset =~ /^ipfilter-(net\d+)$/) {
+	    if (my $ips = $device_ips->{$1}) {
+		$options = [@$options, @$ips];
+	    }
+	}
 
 	# remove duplicates
 	my $nethash = {};
@@ -2896,8 +2997,10 @@ sub generate_ipset_chains {
 		}
 		#http://backreference.org/2013/03/01/ipv6-address-normalization/
 		if ($ver == 6) {
-		    my $ipv6 = inet_pton(AF_INET6, lc($cidr));
-		    $cidr = inet_ntop(AF_INET6, $ipv6);
+		    # ip_compress_address takes an address only, no CIDR
+		    my ($addr, $prefix_len) = ($cidr =~ m@^([^/]*)(/.*)?$@);
+		    $cidr = lc(Net::IP::ip_compress_address($addr, 6));
+		    $cidr .= $prefix_len if defined($prefix_len);
 		    $cidr =~ s|/128$||;
 		} else {
 		    $cidr =~ s|/32$||;
@@ -2998,8 +3101,12 @@ sub save_clusterfw_conf {
 	}
     }
 
-    mkdir $pvefw_conf_dir;
-    PVE::Tools::file_set_contents($clusterfw_conf_filename, $raw);
+    if ($raw) {
+	mkdir $pvefw_conf_dir;
+	PVE::Tools::file_set_contents($clusterfw_conf_filename, $raw);
+    } else {
+	unlink $clusterfw_conf_filename;
+    }
 }
 
 sub load_hostfw_conf {
@@ -3029,7 +3136,11 @@ sub save_hostfw_conf {
 	$raw .= "\n";
     }
 
-    PVE::Tools::file_set_contents($hostfw_conf_filename, $raw);
+    if ($raw) {
+	PVE::Tools::file_set_contents($hostfw_conf_filename, $raw);
+    } else {
+	unlink $hostfw_conf_filename;
+    }
 }
 
 sub compile {
@@ -3055,29 +3166,30 @@ sub compile {
 	$vmfw_configs = read_vm_firewall_configs($cluster_conf, $vmdata, undef, $verbose);
     }
 
-    my ($ruleset, $ipset_ruleset) = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 4, $verbose);
-    my ($rulesetv6) = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 6, $verbose);
-
-    return ($ruleset, $ipset_ruleset, $rulesetv6);
-}
-
-sub compile_iptables_filter {
-    my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $ipversion, $verbose) = @_;
-
-    $cluster_conf->{ipset}->{venet0} = [];
-    my $venet0_ipset_chain = compute_ipset_chain_name(0, 'venet0', $ipversion);
+    return ({},{},{}) if !$cluster_conf->{options}->{enable};
 
     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 };
+	my $localnet_ver;
+	($localnet, $localnet_ver) = parse_ip_or_cidr(local_network() || '127.0.0.0/8');
+
+	$cluster_conf->{aliases}->{local_network} = { 
+	    name => 'local_network', cidr => $localnet, ipversion => $localnet_ver };
     }
 
     push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet };
 
-    return ({}, {}) if !$cluster_conf->{options}->{enable};
+    my $ruleset = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 4, $verbose);
+    my $rulesetv6 = compile_iptables_filter($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, 6, $verbose);
+    my $ipset_ruleset = compile_ipsets($cluster_conf, $vmfw_configs, $vmdata);
+
+    return ($ruleset, $ipset_ruleset, $rulesetv6);
+}
+
+sub compile_iptables_filter {
+    my ($cluster_conf, $hostfw_conf, $vmfw_configs, $vmdata, $ipversion, $verbose) = @_;
 
     my $ruleset = {};
 
@@ -3093,11 +3205,6 @@ sub compile_iptables_filter {
 
     ruleset_chain_add_conn_filters($ruleset, "PVEFW-FORWARD", "ACCEPT");
 
-
-    ruleset_create_chain($ruleset, "PVEFW-VENET-OUT");
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-i venet0 -m set --match-set ${venet0_ipset_chain} src -j PVEFW-VENET-OUT");
-    ruleset_addrule($ruleset, "PVEFW-INPUT", "-i venet0 -m set --match-set ${venet0_ipset_chain} src -j PVEFW-VENET-OUT");
-
     ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
     ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN", $ipversion, $hostfw_options, $cluster_conf, $loglevel);
 
@@ -3106,25 +3213,15 @@ sub compile_iptables_filter {
     ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT");
     ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT");
 
-    ruleset_create_chain($ruleset, "PVEFW-VENET-IN");
-    ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN", $ipversion, $hostfw_options, $cluster_conf, $loglevel);
-
-    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-o venet0 -m set --match-set ${venet0_ipset_chain} dst -j PVEFW-VENET-IN");
-
     generate_std_chains($ruleset, $hostfw_options, $ipversion);
 
     my $hostfw_enable = !(defined($hostfw_options->{enable}) && ($hostfw_options->{enable} == 0));
 
-    my $ipset_ruleset = {};
-
-    # currently pveproxy don't works with ipv6, so let's generate host fw ipv4 only for the moment
-    if ($hostfw_enable && ($ipversion == 4)) {
+    if ($hostfw_enable) {
 	eval { enable_host_firewall($ruleset, $hostfw_conf, $cluster_conf, $ipversion); };
 	warn $@ if $@; # just to be sure - should not happen
     }
 
-    ruleset_addrule($ruleset, "PVEFW-OUTPUT", "-o venet0 -m set --match-set ${venet0_ipset_chain} dst -j PVEFW-VENET-IN");
-
     # generate firewall rules for QEMU VMs
     foreach my $vmid (keys %{$vmdata->{qemu}}) {
 	eval {
@@ -3132,8 +3229,6 @@ sub compile_iptables_filter {
 	    my $vmfw_conf = $vmfw_configs->{$vmid};
 	    return if !$vmfw_conf;
 
-	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf);
-
 	    foreach my $netid (keys %$conf) {
 		next if $netid !~ m/^net(\d+)$/;
 		my $net = PVE::QemuServer::parse_net($conf->{$netid});
@@ -3150,62 +3245,156 @@ sub compile_iptables_filter {
 	warn $@ if $@; # just to be sure - should not happen
     }
 
-    # generate firewall rules for OpenVZ containers
-    foreach my $vmid (keys %{$vmdata->{openvz}}) {
-	eval {
-	    my $conf = $vmdata->{openvz}->{$vmid};
+    # generate firewall rules for LXC containers
+    foreach my $vmid (keys %{$vmdata->{lxc}}) {
+        eval {
+            my $conf = $vmdata->{lxc}->{$vmid};
+            my $vmfw_conf = $vmfw_configs->{$vmid};
+            return if !$vmfw_conf;
+
+            if ($vmfw_conf->{options}->{enable}) {
+		foreach my $netid (keys %$conf) {
+                    next if $netid !~ m/^net(\d+)$/;
+                    my $net = PVE::LXC::Config->parse_lxc_network($conf->{$netid});
+                    next if !$net->{firewall};
+                    my $iface = "veth${vmid}i$1";
+		    my $macaddr = $net->{hwaddr};
+                    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+                                                 $vmfw_conf, $vmid, 'IN', $ipversion);
+                    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
+                                                 $vmfw_conf, $vmid, 'OUT', $ipversion);
+		}
+            }
+        };
+        warn $@ if $@; # just to be sure - should not happen
+    }
 
+    if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){
+	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
+    }
+
+    return $ruleset;
+}
+
+sub mac_to_linklocal {
+    my ($macaddr) = @_;
+    my @parts = split(/:/, $macaddr);
+    # The standard link local address uses the fe80::/64 prefix with the
+    # modified EUI-64 identifier derived from the MAC address by flipping the
+    # universal/local bit and inserting FF:FE in the middle.
+    # See RFC 4291.
+    $parts[0] = sprintf("%02x", hex($parts[0]) ^ 0x02);
+    my @meui64 = (@parts[0,1,2], 'ff', 'fe', @parts[3,4,5]);
+    return "fe80::$parts[0]$parts[1]:$parts[2]FF:FE$parts[3]:$parts[4]$parts[5]";
+}
+
+sub compile_ipsets {
+    my ($cluster_conf, $vmfw_configs, $vmdata) = @_;
+
+    my $localnet;
+    if ($cluster_conf->{aliases}->{local_network}) {
+	$localnet = $cluster_conf->{aliases}->{local_network}->{cidr};
+    } else {
+	my $localnet_ver;
+	($localnet, $localnet_ver) = parse_ip_or_cidr(local_network() || '127.0.0.0/8');
+
+	$cluster_conf->{aliases}->{local_network} = { 
+	    name => 'local_network', cidr => $localnet, ipversion => $localnet_ver };
+    }
+
+    push @{$cluster_conf->{ipset}->{management}}, { cidr => $localnet };
+
+
+    my $ipset_ruleset = {};
+
+    # generate ipsets 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;
 
-	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf);
+	    # When the 'ipfilter' option is enabled every device for which there
+	    # is no 'ipfilter-netX' ipset defiend gets an implicit empty default
+	    # ipset.
+	    # The reason is that ipfilter ipsets are always filled with standard
+	    # IPv6 link-local filters.
+	    my $ipsets = $vmfw_conf->{ipset};
+	    my $implicit_sets = {};
 
-	    if ($vmfw_conf->{options}->{enable}) {
-		if ($conf->{ip_address} && $conf->{ip_address}->{value}) {
-		    my $ip = $conf->{ip_address}->{value};
-		    $ip =~ s/\s+/,/g;
+	    my $device_ips = {};
+	    foreach my $netid (keys %$conf) {
+		next if $netid !~ m/^net(\d+)$/;
+		my $net = PVE::QemuServer::parse_net($conf->{$netid});
+		next if !$net->{firewall};
 
-		    my @ips = ();
+		if ($vmfw_conf->{options}->{ipfilter} && !$ipsets->{"ipfilter-$netid"}) {
+		    $implicit_sets->{"ipfilter-$netid"} = [];
+		}
 
-		    foreach my $singleip (split(',', $ip)) {
-			my $singleip_ver = parse_address_list($singleip); # make sure we have a valid $ip list
-			push @{$cluster_conf->{ipset}->{venet0}}, { cidr => $singleip };
-			push @ips, $singleip if $singleip_ver == $ipversion;
-		    }
+		my $macaddr = $net->{macaddr};
+		my $linklocal = mac_to_linklocal($macaddr);
+		$device_ips->{$netid} = [
+		    { cidr => $linklocal },
+		    { cidr => 'fe80::/10', nomatch => 1 }
+		];
+	    }
 
-		    if (scalar(@ips)) {
-			my $ip_list = join(',', @ips);
-			generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip_list, 'IN', $ipversion);
-			generate_venet_rules_direction($ruleset, $cluster_conf, $vmfw_conf, $vmid, $ip_list, 'OUT', $ipversion);
-		    }
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf, $device_ips, $ipsets);
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf, $device_ips, $implicit_sets);
+	};
+	warn $@ if $@; # just to be sure - should not happen
+    }
+
+    # generate firewall rules for LXC containers
+    foreach my $vmid (keys %{$vmdata->{lxc}}) {
+	eval {
+	    my $conf = $vmdata->{lxc}->{$vmid};
+	    my $vmfw_conf = $vmfw_configs->{$vmid};
+	    return if !$vmfw_conf;
+
+	    # When the 'ipfilter' option is enabled every device for which there
+	    # is no 'ipfilter-netX' ipset defiend gets an implicit empty default
+	    # ipset.
+	    # The reason is that ipfilter ipsets are always filled with standard
+	    # IPv6 link-local filters, as well as the IP addresses configured
+	    # for the container.
+	    my $ipsets = $vmfw_conf->{ipset};
+	    my $implicit_sets = {};
+
+	    my $device_ips = {};
+	    foreach my $netid (keys %$conf) {
+		next if $netid !~ m/^net(\d+)$/;
+		my $net = PVE::LXC::Config->parse_lxc_network($conf->{$netid});
+		next if !$net->{firewall};
+
+		if ($vmfw_conf->{options}->{ipfilter} && !$ipsets->{"ipfilter-$netid"}) {
+		    $implicit_sets->{"ipfilter-$netid"} = [];
 		}
-	    }
 
-	    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};
-		    next if !$bridge || $bridge !~ m/^vmbr\d+(v(\d+))?f$/; # firewall enabled ?
-		    my $macaddr = $d->{mac};
-		    my $iface = $d->{host_ifname};
-		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
-						 $vmfw_conf, $vmid, 'IN', $ipversion);
-		    generate_tap_rules_direction($ruleset, $cluster_conf, $iface, $netid, $macaddr,
-						 $vmfw_conf, $vmid, 'OUT', $ipversion);
+		my $macaddr = $net->{hwaddr};
+		my $linklocal = mac_to_linklocal($macaddr);
+		my $set = $device_ips->{$netid} = [
+		    { cidr => $linklocal },
+		    { cidr => 'fe80::/10', nomatch => 1 }
+		];
+		if ($net->{ip} =~ m!^($IPV4RE)(?:/\d+)?$!) {
+		    push @$set, { cidr => $1 };
+		}
+		if ($net->{ip6} =~ m!^($IPV6RE)(?:/\d+)?$!) {
+		    push @$set, { cidr => $1 };
 		}
 	    }
+
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf, $device_ips, $ipsets);
+	    generate_ipset_chains($ipset_ruleset, $cluster_conf, $vmfw_conf, $device_ips, $implicit_sets);
 	};
 	warn $@ if $@; # just to be sure - should not happen
     }
 
-    if(ruleset_chain_exist($ruleset, "PVEFW-IPS")){
-	ruleset_insertrule($ruleset, "PVEFW-FORWARD", "-m conntrack --ctstate RELATED,ESTABLISHED -j PVEFW-IPS");
-    }
-
-    generate_ipset_chains($ipset_ruleset, undef, $cluster_conf);
+    generate_ipset_chains($ipset_ruleset, undef, $cluster_conf, undef, $cluster_conf->{ipset});
 
-    return ($ruleset, $ipset_ruleset);
+    return $ipset_ruleset;
 }
 
 sub get_ruleset_status {
@@ -3379,7 +3568,7 @@ sub apply_ruleset {
     enable_bridge_firewall();
 
     my ($ipset_create_cmdlist, $ipset_delete_cmdlist, $ipset_changes) =
-	get_ipset_cmdlist($ipset_ruleset, undef, $verbose);
+	get_ipset_cmdlist($ipset_ruleset, $verbose);
 
     my ($cmdlist, $changes) = get_ruleset_cmdlist($ruleset, $verbose);
     my ($cmdlistv6, $changesv6) = get_ruleset_cmdlist($rulesetv6, $verbose, "ip6tables");