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 962AC98795 for ; Wed, 15 Nov 2023 15:22:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 735BD774B for ; Wed, 15 Nov 2023 15:22:21 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Wed, 15 Nov 2023 15:22:16 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id DF8AE7D62; Wed, 15 Nov 2023 15:22:09 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id CE1BB187ECD; Wed, 15 Nov 2023 15:22:09 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 15 Nov 2023 15:21:57 +0100 Message-Id: <20231115142208.563587-5-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.019 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. [vnets.pm, plugin.pm, dnsmasq.pm, dhcp.pm] Subject: [pve-devel] [PATCH pve-network 2/3] add add_dhcp_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:51 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Dhcp.pm | 9 ++++--- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 40 ++++++++++++++++++++++++----- src/PVE/Network/SDN/Dhcp/Plugin.pm | 2 +- src/PVE/Network/SDN/Vnets.pm | 15 +++++++++++ 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm index b178927..99561b3 100644 --- a/src/PVE/Network/SDN/Dhcp.pm +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -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 { diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index 21a6ddd..b672dd3 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -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; + } + + if(!$match4 && $ip4) { + print $out "$mac,$ip4\n"; + $change = 1; } - print $out "$mac,$ip\n"; + 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 { diff --git a/src/PVE/Network/SDN/Dhcp/Plugin.pm b/src/PVE/Network/SDN/Dhcp/Plugin.pm index 7b9e9b7..8d0f7ba 100644 --- a/src/PVE/Network/SDN/Dhcp/Plugin.pm +++ b/src/PVE/Network/SDN/Dhcp/Plugin.pm @@ -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'; } diff --git a/src/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm index 9ec16eb..ad585f0 100644 --- a/src/PVE/Network/SDN/Vnets.pm +++ b/src/PVE/Network/SDN/Vnets.pm @@ -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; @@ -176,4 +177,18 @@ sub del_ips_from_mac { PVE::Network::SDN::Vnets::del_ip($vnetid, $ip6, $hostname, $mac) if $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; -- 2.39.2