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 297409087B for ; Tue, 2 Apr 2024 18:08:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09F6E9A23 for ; Tue, 2 Apr 2024 18:07:54 +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 ; Tue, 2 Apr 2024 18:07:53 +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 07C9244A55 for ; Tue, 2 Apr 2024 18:07:53 +0200 (CEST) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Tue, 2 Apr 2024 18:07:33 +0200 Message-ID: <20240402160736.519660-7-s.lendl@proxmox.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402160736.519660-2-s.lendl@proxmox.com> References: <20240402160736.519660-2-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 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] [PATCH v2 pve-network 4/9] dnsmasq: extract function that updates dnsmasq lease via dbus 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, 02 Apr 2024 16:08:24 -0000 Extract the dbus based interactions with dnsmasq so that it can be mocked in tests. Signed-off-by: Stefan Lendl Reviewed-by: Max Carrara Tested-by: Max Carrara --- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index 5a227ba..c14f5d7 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -38,6 +38,17 @@ sub ethers_file { return "$DNSMASQ_CONFIG_ROOT/$dhcpid/ethers"; } +sub update_lease { + my ($dhcpid, $ip4, $mac) = @_; + #update lease as ip could still be associated to an old removed mac + my $bus = Net::DBus->system(); + my $dnsmasq = $bus->get_service("uk.org.thekelleys.dnsmasq.$dhcpid"); + my $manager = $dnsmasq->get_object("/uk/org/thekelleys/dnsmasq","uk.org.thekelleys.dnsmasq.$dhcpid"); + + my @hostname = unpack("C*", "*"); + $manager->AddDhcpLease($ip4, $mac, \@hostname, undef, 0, 0, 0) if $ip4; +} + sub add_ip_mapping { my ($class, $dhcpid, $macdb, $mac, $ip4, $ip6) = @_; @@ -107,16 +118,7 @@ sub add_ip_mapping { my $service_name = "dnsmasq\@$dhcpid"; systemctl_service('reload', $service_name) if $reload; - - #update lease as ip could still be associated to an old removed mac - my $bus = Net::DBus->system(); - my $dnsmasq = $bus->get_service("uk.org.thekelleys.dnsmasq.$dhcpid"); - my $manager = $dnsmasq->get_object("/uk/org/thekelleys/dnsmasq","uk.org.thekelleys.dnsmasq.$dhcpid"); - - my @hostname = unpack("C*", "*"); - $manager->AddDhcpLease($ip4, $mac, \@hostname, undef, 0, 0, 0) if $ip4; -# $manager->AddDhcpLease($ip6, $mac, \@hostname, undef, 0, 0, 0) if $ip6; - + update_lease($dhcpid, $ip4, $mac); } sub configure_subnet { -- 2.44.0