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 443AE9BC0C for ; Tue, 21 Nov 2023 13:40:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2CA788E77 for ; Tue, 21 Nov 2023 13:40:18 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 21 Nov 2023 13:40:17 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 570902C080A; Tue, 21 Nov 2023 13:40:17 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 21 Nov 2023 13:40:12 +0100 Message-Id: <20231121124012.233082-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.444 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network] dhcp: fix allocating IP for every defined dhcp-range 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, 21 Nov 2023 12:40:18 -0000 Due to the wrong check an IP was allocated for every DHCP range, instead of only allocating an IP in the first free DHCP range. Suggested-By: Stefan Lendl Signed-off-by: Stefan Hanreich --- The fix I talked about off-list was actually unrelated to this. It prevented allocating IP addresses in multiple IPv4/6 subnets, not allocating multiple IP addresses for multiple DHCP ranges. So I did not remove anything in this patch. src/PVE/Network/SDN/Subnets.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm index b05b3d9..8e2a6aa 100644 --- a/src/PVE/Network/SDN/Subnets.pm +++ b/src/PVE/Network/SDN/Subnets.pm @@ -238,7 +238,7 @@ sub add_next_free_ip { foreach my $range (@$dhcp_ranges) { $ip = $plugin->add_range_next_freeip($plugin_config, $subnet, $range, $data); - next if !$ip; + last if $ip; } } else { $ip = $plugin->add_next_freeip($plugin_config, $subnetid, $subnet, $hostname, $mac, $vmid); -- 2.39.2