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 820BC9D8EA for ; Fri, 27 Oct 2023 13:20:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6825938725 for ; Fri, 27 Oct 2023 13:20:52 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 27 Oct 2023 13:20:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 76EE242523; Fri, 27 Oct 2023 13:20:51 +0200 (CEST) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Fri, 27 Oct 2023 13:20:18 +0200 Message-ID: <20231027112022.1960451-3-s.lendl@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231027112022.1960451-1-s.lendl@proxmox.com> References: <87v8axbjh1.fsf@gmail.com> <20231027112022.1960451-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.097 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC pve-network 2/3] always generate dnsmasq ethers file 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: Fri, 27 Oct 2023 11:20:52 -0000 Makes dnsmasq stateless and can be generated from the IPAM. On dhcp_add_ip always generate the entire ethers file. Signed-off-by: Stefan Lendl --- src/PVE/Network/SDN/Dhcp.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm index b92c73a..b854cce 100644 --- a/src/PVE/Network/SDN/Dhcp.pm +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -87,8 +87,14 @@ sub add_mapping { next if !$ip; + # generates ethers file every time + my $ipam_db = $ipam_plugin->read_db(); + my $dbzone = $ipam_db->{zones}->{$subnet_config->{zone}}; + my $dbsubnet = $dbzone->{subnets}->{$subnet_config->{cidr}}; + my $dbsubnet_ips = $dbsubnet->{ips}; + my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcp_config->{type}); - $dhcp_plugin->add_ip_mapping($dhcp_config, $mac, $ip); + $dhcp_plugin->generate_config($dhcp_config, $dbsubnet_ips); return $ip; } -- 2.41.0