From: Alexandre Derumier Date: Sat, 18 Nov 2023 14:13:10 +0000 (+0100) Subject: dhcp : remove del_ip_mapping X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=77617306c3045c6a552c6aa929d8e115f83c547a;hp=bbc34c2062843be0615a46d1ed27b88997baa369;p=pve-network.git dhcp : remove del_ip_mapping The cleanup is done in add_ip_mapping Signed-off-by: Alexandre Derumier --- 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';