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 CCD2F986FA for ; Wed, 15 Nov 2023 15:22:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F2817912 for ; Wed, 15 Nov 2023 15:22:26 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id E28177BCB; Wed, 15 Nov 2023 15:22:09 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id E15D2187ECF; Wed, 15 Nov 2023 15:22:09 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 15:22:00 +0100 Message-Id: <20231115142208.563587-8-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231115142208.563587-1-aderumier@odiso.com> References: <20231115142208.563587-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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) Subject: [pve-devel] [PATCH pve-network 3/3] dhcp: delete remove_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: Wed, 15 Nov 2023 14:22:27 -0000 The cleanup of old mac is now done when we add a new mac/ip Signed-off-by: Alexandre Derumier --- src/PVE/API2/Network/SDN/Ipam.pm | 1 - src/PVE/Network/SDN/Dhcp.pm | 15 ------------- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 34 ----------------------------- src/PVE/Network/SDN/Dhcp/Plugin.pm | 5 ----- 4 files changed, 55 deletions(-) diff --git a/src/PVE/API2/Network/SDN/Ipam.pm b/src/PVE/API2/Network/SDN/Ipam.pm index 66131e3..68d99a6 100644 --- a/src/PVE/API2/Network/SDN/Ipam.pm +++ b/src/PVE/API2/Network/SDN/Ipam.pm @@ -104,7 +104,6 @@ __PACKAGE__->register_method ({ my $vnet = extract_param($param, 'vnet'); my $mac = extract_param($param, 'mac'); - PVE::Network::SDN::Dhcp::remove_mapping($vnet, $mac); PVE::Network::SDN::Vnets::del_ips_from_mac($vnet, $mac); return undef; diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm index 99561b3..06d03e2 100644 --- a/src/PVE/Network/SDN/Dhcp.pm +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -38,21 +38,6 @@ sub add_mapping { $dhcp_plugin->add_ip_mapping($zoneid, $macdb, $mac, $ip4, $ip6) } -sub remove_mapping { - my ($vnetid, $mac) = @_; - - my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); - return if !$vnet; - - my $zoneid = $vnet->{zone}; - my $zone = PVE::Network::SDN::Zones::get_zone($zoneid); - - return if !$zone->{ipam} || !$zone->{dhcp}; - - my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($zone->{dhcp}); - $dhcp_plugin->del_ip_mapping($zoneid, $mac); -} - sub regenerate_config { my ($reload) = @_; diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index b672dd3..46172c5 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