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 624CF63597 for ; Tue, 25 Aug 2020 07:21:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 31AF522FFA for ; Tue, 25 Aug 2020 07:21:13 +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 8720C22D1A for ; Tue, 25 Aug 2020 07:20:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 6A6B015B9E32; Tue, 25 Aug 2020 07:20:59 +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 PFUa7mtZnvaK; Tue, 25 Aug 2020 07:20:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 50D1715B9EB1; Tue, 25 Aug 2020 07:20:59 +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 PvH_woIsXcyI; Tue, 25 Aug 2020 07:20:59 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id 2306815B9EA9; Tue, 25 Aug 2020 07:20:59 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 25 Aug 2020 07:02:21 +0200 Message-Id: <20200825050222.12447-18-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825050222.12447-1-aderumier@odiso.com> References: <20200825050222.12447-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.005 Adjusted score from AWL reputation of From: address 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 T_SPF_TEMPERROR 0.01 SPF: test of record failed (temperror) URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pveplugin.pm] Subject: [pve-devel] [PATCH v6 pve-network 17/18] ipam : pveplugin : fix find_next_free_ip 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, 25 Aug 2020 05:21:16 -0000 skip network && broadcast address --- PVE/Network/SDN/Ipams/PVEPlugin.pm | 11 ++++++----- debian/control | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PVE/Network/SDN/Ipams/PVEPlugin.pm b/PVE/Network/SDN/Ipams/P= VEPlugin.pm index 99af0ed..741a680 100644 --- a/PVE/Network/SDN/Ipams/PVEPlugin.pm +++ b/PVE/Network/SDN/Ipams/PVEPlugin.pm @@ -6,7 +6,7 @@ use PVE::INotify; use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_register_file cfs_l= ock_file); use PVE::Tools; use JSON; -use Net::IP; +use NetAddr::IP; use Digest::SHA; =20 use base('PVE::Network::SDN::Ipams::Plugin'); @@ -93,12 +93,13 @@ sub add_next_freeip { =20 my $db =3D read_db(); my $s =3D $db->{subnets}->{$cidr}; - - my $iplist =3D new Net::IP($cidr); + my $iplist =3D new NetAddr::IP($cidr); + my $broadcast =3D $iplist->broadcast(); =20 while(1) { - my $ip =3D $iplist->ip(); - ++$iplist; + $iplist++; + last if $iplist eq $broadcast; + my $ip =3D $iplist->addr(); next if defined($s->{ips}->{$ip}); $freeip =3D $ip; last; diff --git a/debian/control b/debian/control index c54f8bc..b2e3614 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Depends: libpve-common-perl (>=3D 5.0-45), pve-cluster (>=3D 5.0-32), libnet-subnet-perl, libnet-ip-perl, + libnetaddr-ip-perl, ${misc:Depends}, ${perl:Depends}, Recommends: frr-pythontools, ifupdown2 --=20 2.20.1