Proxmox/pve-network
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-01-23 02:04:20 +03:00
Code Releases Activity

add add_dhcp_mapping

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-11-17 12:39:54 +01:00 committed by Thomas Lamprecht
parent c1606bba52
commit beef73d642
4 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PVE/Network/SDN/Dhcp.pm
View File

@ -8,6 +8,7 @@ use PVE::Cluster qw(cfs_read_file);
use PVE::Network::SDN;
use PVE::Network::SDN::SubnetPlugin;
use PVE::Network::SDN::Dhcp qw(config);
use PVE::Network::SDN::Ipams;
use PVE::Network::SDN::Subnets qw(sdn_subnets_config config get_dhcp_ranges);
use PVE::Network::SDN::Dhcp::Plugin;
use PVE::Network::SDN::Dhcp::Dnsmasq;
@ -30,9 +31,11 @@ sub add_mapping {
return if !$zone->{ipam} || !$zone->{dhcp};
my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($zone->{dhcp});
$dhcp_plugin->add_ip_mapping($zoneid, $mac, $ip4) if $ip4;
$dhcp_plugin->add_ip_mapping($zoneid, $mac, $ip6) if $ip6;
my $dhcptype = $zone->{dhcp};
my $macdb = PVE::Network::SDN::Ipams::read_macdb();
my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcptype);
$dhcp_plugin->add_ip_mapping($zoneid, $macdb, $mac, $ip4, $ip6)
}
sub remove_mapping {

40
src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
View File

@ -53,21 +53,49 @@ sub del_ip_mapping {
}
sub add_ip_mapping {
my ($class, $dhcpid, $mac, $ip) = @_;
my ($class, $dhcpid, $macdb, $mac, $ip4, $ip6) = @_;
my $ethers_file = "$DNSMASQ_CONFIG_ROOT/$dhcpid/ethers";
my $ethers_tmp_file = "$ethers_file.tmp";
my $change = undef;
my $match4 = undef;
my $match6 = undef;
my $appendFn = 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;
chomp($line);
my ($parsed_mac, $parsed_ip) = split(/,/, $line);
#delete removed mac
if (!defined($macdb->{macs}->{$parsed_mac})) {
$change = 1;
next;
}
#delete changed ip
my $ipversion = Net::IP::ip_is_ipv4($parsed_ip) ? "ip4" : "ip6";
if ($macdb->{macs}->{$parsed_mac}->{$ipversion} && $macdb->{macs}->{$parsed_mac}->{$ipversion} ne $parsed_ip) {
$change = 1;
next;
}
print $out "$parsed_mac,$parsed_ip\n";
#check if mac/ip already exist
$match4 = 1 if $parsed_mac eq $mac && $macdb->{macs}->{$mac}->{'ip4'} && $macdb->{macs}->{$mac}->{'ip4'} eq $ip4;
$match6 = 1 if $parsed_mac eq $mac && $macdb->{macs}->{$mac}->{'ip6'} && $macdb->{macs}->{$mac}->{'ip6'} eq $ip6;
}
print $out "$mac,$ip\n";
if(!$match4 && $ip4) {
print $out "$mac,$ip4\n";
$change = 1;
}
if(!$match6 && $ip6) {
print $out "$mac,$ip6\n";
$change = 1;
}
close $in;
close $out;
move $ethers_tmp_file, $ethers_file;
@ -77,12 +105,12 @@ sub add_ip_mapping {
PVE::Tools::lock_file($ethers_file, 10, $appendFn);
if ($@) {
warn "Unable to add $mac/$ip to the dnsmasq configuration: $@\n";
warn "Unable to add $mac to the dnsmasq configuration: $@\n";
return;
}
my $service_name = "dnsmasq\@$dhcpid";
PVE::Tools::run_command(['systemctl', 'reload', $service_name]);
PVE::Tools::run_command(['systemctl', 'reload', $service_name]) if $change;
}
sub configure_subnet {

2
src/PVE/Network/SDN/Dhcp/Plugin.pm
View File

@ -23,7 +23,7 @@ sub private {
}
sub add_ip_mapping {
my ($class, $dhcp_config, $mac, $ip) = @_;
my ($class, $dhcpid, $macdb, $mac, $ip4, $ip6) = @_;
die 'implement in sub class';
}

15
src/PVE/Network/SDN/Vnets.pm
View File

@ -7,6 +7,7 @@ use Net::IP;
use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file);
use PVE::Network::SDN;
use PVE::Network::SDN::Dhcp;
use PVE::Network::SDN::Subnets;
use PVE::Network::SDN::Zones;
@ -184,4 +185,18 @@ sub del_ips_from_mac {
return ($ip4, $ip6);
}
sub add_dhcp_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 ($ip4,$ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac);
PVE::Network::SDN::Dhcp::add_mapping($vnetid, $mac, $ip4, $ip6) if $ip4 || $ip6;
}
1;