From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 30 Oct 2014 12:12:58 +0000 (+0100)
Subject: parse_address_list: improve type detection
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=c344e509268ebfc3fdf01a73e8024661afafd601

parse_address_list: improve type detection
---

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 37dbcb0..d20f956 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -806,13 +806,14 @@ sub parse_address_list {
 
     foreach my $elem (split(/,/, $str)) {
 	$count++;
-	if (!Net::IP->new($elem)) {
+	my $ip = Net::IP->new($elem);
+	if (!$ip) {
 	    my $err = Net::IP::Error();
 	    die "invalid IP address: $err\n";
 	}
 	$iprange = 1 if $elem =~ m/-/;
 
-	my $new_ipversion = Net::IP::ip_get_version($elem); #fixme : don't work with range
+	my $new_ipversion = Net::IP::ip_is_ipv6($ip->ip()) ? 6 : 4;
 
 	die "detected mixed ipv4/ipv6 addresses in address list '$str'\n"
 	    if defined($ipversion) && ($new_ipversion != $ipversion);