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 383B3BBADA for ; Tue, 19 Dec 2023 09:32:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 163E033B7A for ; Tue, 19 Dec 2023 09:32:25 +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 ; Tue, 19 Dec 2023 09:32:24 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 1A32280FF; Tue, 19 Dec 2023 09:32:17 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 0FFA8DE8AA; Tue, 19 Dec 2023 09:32:17 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 19 Dec 2023 09:32:11 +0100 Message-Id: <20231219083216.2551645-3-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231219083216.2551645-1-aderumier@odiso.com> References: <20231219083216.2551645-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 2/7] dhcp: enable-ra on layer3 zones only 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: Tue, 19 Dec 2023 08:32:55 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 4 ++-- src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 2 +- src/PVE/Network/SDN/Zones/Plugin.pm | 2 +- src/PVE/Network/SDN/Zones/SimplePlugin.pm | 9 +++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index 169ce56..b488613 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -208,8 +208,6 @@ CFG my $default_dnsmasq_config = <{dhcp_ra}; + PVE::Tools::file_set_contents( "$config_directory/00-default.conf", $default_dnsmasq_config diff --git a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm index c806564..3c3278a 100644 --- a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -275,7 +275,7 @@ sub generate_sdn_config { sub get_options { my ($class, $plugin_config, $zoneid) = @_; - my $options = { vrf => "vrf_$zoneid"}; + my $options = { vrf => "vrf_$zoneid", dhcp_ra => 1}; return $options; } diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm index 07e8389..7804b1c 100644 --- a/src/PVE/Network/SDN/Zones/Plugin.pm +++ b/src/PVE/Network/SDN/Zones/Plugin.pm @@ -132,7 +132,7 @@ sub controller_reload { sub get_options { my ($class, $plugin_config, $zoneid) = @_; - my $options = { vrf => 'default'}; + my $options = { vrf => 'default', dhcp_ra => undef}; return $options; } diff --git a/src/PVE/Network/SDN/Zones/SimplePlugin.pm b/src/PVE/Network/SDN/Zones/SimplePlugin.pm index c996bf3..58a75a0 100644 --- a/src/PVE/Network/SDN/Zones/SimplePlugin.pm +++ b/src/PVE/Network/SDN/Zones/SimplePlugin.pm @@ -130,6 +130,15 @@ sub generate_sdn_config { return $config; } + +sub get_options { + my ($class, $plugin_config, $zoneid) = @_; + + my $options = { vrf => 'default', dhcp_ra => 1}; + + return $options; +} + sub vnet_update_hook { my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_; -- 2.39.2