From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 34BBB66C1F for ; Tue, 28 Jul 2020 13:00:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 16EEE23BE4 for ; Tue, 28 Jul 2020 13:00:29 +0200 (CEST) Received: from mailpro.odiso.net (mailpro.odiso.net [89.248.211.110]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7F62923A85 for ; Tue, 28 Jul 2020 13:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 92F23111813C; Tue, 28 Jul 2020 13:00:11 +0200 (CEST) Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ShEzwT6YaCfr; Tue, 28 Jul 2020 13:00:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id B0FE31118186; Tue, 28 Jul 2020 13:00:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at mailpro.odiso.com Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id gJPMiszKSMnV; Tue, 28 Jul 2020 13:00:07 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id A14241118154; Tue, 28 Jul 2020 13:00:06 +0200 (CEST) From: Alexandre Derumier To: pve-devel@pve.proxmox.com Date: Tue, 28 Jul 2020 12:59:58 +0200 Message-Id: <20200728105958.18313-13-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200728105958.18313-1-aderumier@odiso.com> References: <20200728105958.18313-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vnets.pm] Subject: [pve-devel] [PATCH v4 pve-network 12/12] vnets: find_free_ip : add ipversion detection X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2020 11:00:30 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Vnets.pm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index d474037..350fff4 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -4,6 +4,7 @@ use strict; use warnings; =20 use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); +use Net::IP; use PVE::Network::SDN::Subnets; use PVE::Network::SDN::Ipams; =20 @@ -55,25 +56,30 @@ sub get_vnet { } =20 sub get_next_free_ip { - my ($vnetid) =3D @_; + my ($vnetid, $ipversion) =3D @_; =20 + $ipversion =3D 4 if !$ipversion; my $vnets_cfg =3D PVE::Network::SDN::Vnets::config(); my $subnets_cfg =3D PVE::Network::SDN::Subnets::config(); my $vnet =3D $vnets_cfg->{ids}->{$vnetid}; my @subnets =3D PVE::Tools::split_list($vnet->{subnets}) if $vnet->{= subnets}; my $ip =3D undef; + my $subnetcount =3D 0; foreach my $s (@subnets) { - my $subnetid =3D $s =3D~ s/\//-/r; - my $subnet =3D $subnets_cfg->{ids}->{$subnetid}; - if ($subnet && $subnet->{ipam}) { - eval { - $ip =3D PVE::Network::SDN::Ipams::next_free_ip($subnetid= , $subnet); - }; - warn $@ if $@; - } - last if $ip; + my $subnetid =3D $s =3D~ s/\//-/r; + my ($network, $mask) =3D split(/-/, $subnetid); + next if $ipversion !=3D Net::IP::ip_get_version($network); + $subnetcount++; + my $subnet =3D $subnets_cfg->{ids}->{$subnetid}; + if ($subnet && $subnet->{ipam}) { + eval { + $ip =3D PVE::Network::SDN::Ipams::next_free_ip($subnetid, $subnet); + }; + warn $@ if $@; + } + last if $ip; } - die "can't find any ip" if !$ip; + die "can't find any free ip" if !$ip && $subnetcount > 0; return $ip; } =20 --=20 2.20.1