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 174BF605B7 for ; Thu, 24 Sep 2020 10:42:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D8767E915 for ; Thu, 24 Sep 2020 10:41:15 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id A902FE7C6 for ; Thu, 24 Sep 2020 10:41:01 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 1C752D684E; Thu, 24 Sep 2020 10:40:55 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 24 Sep 2020 10:40:41 +0200 Message-Id: <20200924084054.611548-13-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200924084054.611548-1-aderumier@odiso.com> References: <20200924084054.611548-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.739 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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 v8 pve-network 12/25] 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: Thu, 24 Sep 2020 08:42:05 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Vnets.pm | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index d474037..0de3fd5 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -4,6 +4,7 @@ use strict; use warnings; 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; @@ -55,26 +56,34 @@ sub get_vnet { } sub get_next_free_ip { - my ($vnetid) = @_; + my ($vnetid, $ipversion) = @_; + $ipversion = 4 if !$ipversion; my $vnets_cfg = PVE::Network::SDN::Vnets::config(); my $subnets_cfg = PVE::Network::SDN::Subnets::config(); my $vnet = $vnets_cfg->{ids}->{$vnetid}; my @subnets = PVE::Tools::split_list($vnet->{subnets}) if $vnet->{subnets}; my $ip = undef; + my $subnet = undef; + my $subnetcount = 0; foreach my $s (@subnets) { - my $subnetid = $s =~ s/\//-/r; - my $subnet = $subnets_cfg->{ids}->{$subnetid}; - if ($subnet && $subnet->{ipam}) { - eval { - $ip = PVE::Network::SDN::Ipams::next_free_ip($subnetid, $subnet); - }; - warn $@ if $@; - } - last if $ip; + my $subnetid = $s =~ s/\//-/r; + my ($network, $mask) = split(/-/, $subnetid); + next if $ipversion != Net::IP::ip_get_version($network); + $subnetcount++; + $subnet = $subnets_cfg->{ids}->{$subnetid}; + if ($subnet && $subnet->{ipam}) { + eval { + $ip = PVE::Network::SDN::Ipams::next_free_ip($subnetid, $subnet); + }; + warn $@ if $@; + } + last if $ip; } - die "can't find any ip" if !$ip; - return $ip; + die "can't find any free ip" if !$ip && $subnetcount > 0; + + $subnet->{freeip} = $ip; + return $subnet; } 1; -- 2.20.1