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 CAF489AE00 for ; Sat, 18 Nov 2023 15:13:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9519F6E45 for ; Sat, 18 Nov 2023 15:13:27 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Sat, 18 Nov 2023 15:13:23 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id DB11D8106; Sat, 18 Nov 2023 15:13:15 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id CB5A3180042; Sat, 18 Nov 2023 15:13:15 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Sat, 18 Nov 2023 15:13:10 +0100 Message-Id: <20231118141314.2785997-4-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231118141314.2785997-1-aderumier@odiso.com> References: <20231118141314.2785997-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - T_SPF_HELO_TEMPERROR 0.01 SPF: test of HELO 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. [plugin.pm, dnsmasq.pm] Subject: [pve-devel] [PATCH pve-network 3/7] dhcp : remove del_ip_mapping 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: Sat, 18 Nov 2023 14:13:57 -0000 The cleanup is done in add_ip_mapping Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 34 ----------------------------- src/PVE/Network/SDN/Dhcp/Plugin.pm | 5 ----- 2 files changed, 39 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index c4b6bde..763ad09 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -18,40 +18,6 @@ sub type { return 'dnsmasq'; } -sub del_ip_mapping { - my ($class, $dhcpid, $mac) = @_; - - my $ethers_file = "$DNSMASQ_CONFIG_ROOT/$dhcpid/ethers"; - my $ethers_tmp_file = "$ethers_file.tmp"; - - my $removeFn = sub { - open(my $in, '<', $ethers_file) or die "Could not open file '$ethers_file' $!\n"; - open(my $out, '>', $ethers_tmp_file) or die "Could not open file '$ethers_tmp_file' $!\n"; - - while (my $line = <$in>) { - next if $line =~ m/^$mac/; - print $out $line; - } - - close $in; - close $out; - - move $ethers_tmp_file, $ethers_file; - - chmod 0644, $ethers_file; - }; - - PVE::Tools::lock_file($ethers_file, 10, $removeFn); - - if ($@) { - warn "Unable to remove $mac from the dnsmasq configuration: $@\n"; - return; - } - - my $service_name = "dnsmasq\@$dhcpid"; - PVE::Tools::run_command(['systemctl', 'reload', $service_name]); -} - sub add_ip_mapping { my ($class, $dhcpid, $macdb, $mac, $ip4, $ip6) = @_; diff --git a/src/PVE/Network/SDN/Dhcp/Plugin.pm b/src/PVE/Network/SDN/Dhcp/Plugin.pm index 8d0f7ba..d05378d 100644 --- a/src/PVE/Network/SDN/Dhcp/Plugin.pm +++ b/src/PVE/Network/SDN/Dhcp/Plugin.pm @@ -27,11 +27,6 @@ sub add_ip_mapping { die 'implement in sub class'; } -sub del_ip_mapping { - my ($class, $dhcp_config, $mac) = @_; - die 'implement in sub class'; -} - sub configure_range { my ($class, $dhcp_config, $subnet_config, $range_config) = @_; die 'implement in sub class'; -- 2.39.2