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 D7A106194B for ; Mon, 28 Sep 2020 10:43:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A3D0A2B4DD for ; Mon, 28 Sep 2020 10:43:45 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 061222B41D for ; Mon, 28 Sep 2020 10:43:38 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id F0C5DD6868; Mon, 28 Sep 2020 10:43:37 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 28 Sep 2020 10:43:27 +0200 Message-Id: <20200928084336.3487196-18-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200928084336.3487196-1-aderumier@odiso.com> References: <20200928084336.3487196-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.486 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.078 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 Subject: [pve-devel] [PATCH v9 pve-network 17/26] 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: Mon, 28 Sep 2020 08:43:46 -0000 skip network && broadcast address Signed-off-by: Alexandre Derumier --- 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/PVEPlugin.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_lock_file); use PVE::Tools; use JSON; -use Net::IP; +use NetAddr::IP; use Digest::SHA; use base('PVE::Network::SDN::Ipams::Plugin'); @@ -93,12 +93,13 @@ sub add_next_freeip { my $db = read_db(); my $s = $db->{subnets}->{$cidr}; - - my $iplist = new Net::IP($cidr); + my $iplist = new NetAddr::IP($cidr); + my $broadcast = $iplist->broadcast(); while(1) { - my $ip = $iplist->ip(); - ++$iplist; + $iplist++; + last if $iplist eq $broadcast; + my $ip = $iplist->addr(); next if defined($s->{ips}->{$ip}); $freeip = $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 (>= 5.0-45), pve-cluster (>= 5.0-32), libnet-subnet-perl, libnet-ip-perl, + libnetaddr-ip-perl, ${misc:Depends}, ${perl:Depends}, Recommends: frr-pythontools, ifupdown2 -- 2.20.1