From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 9CF2E1FF0BC for ; Thu, 29 Oct 2026 15:44:36 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 6F76B215F5; Thu, 29 Oct 2026 15:44:18 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ve-rs v4 2/9] frr: add IPv6 router advertisement support Date: Thu, 29 Oct 2026 15:44:01 +0100 Message-ID: <20261029144408.2646288-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261029144408.2646288-1-h.laimer@proxmox.com> References: <20261029144408.2646288-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793285053749 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.357 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 6UPC7E2ILIQNSYHJLXRMZFW4P3MBTXTE X-Message-ID-Hash: 6UPC7E2ILIQNSYHJLXRMZFW4P3MBTXTE X-MailFrom: h.laimer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The generated FRR config can now carry IPv6 Router Advertisement settings per interface, along with the prefixes to announce. Each of these interfaces gets a block of ipv6 nd commands that turns its advertisements on. Settings left unset are not rendered, so FRR keeps its defaults for them. Signed-off-by: Hannes Laimer --- Notes: v3: - keep prefix lifetimes on no-autoconfig prefixes (were dropped) - emit ra-interval before ra-lifetime - single prefix line instead of duplicated autoconfig branches .../templates/frr.conf.jinja | 1 + .../templates/nd_interfaces.jinja | 28 ++++++++++ proxmox-frr/src/ser/mod.rs | 6 ++ proxmox-frr/src/ser/nd.rs | 56 +++++++++++++++++++ proxmox-frr/src/ser/serializer.rs | 6 +- 5 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 proxmox-frr-templates/templates/nd_interfaces.jinja create mode 100644 proxmox-frr/src/ser/nd.rs diff --git a/proxmox-frr-templates/templates/frr.conf.jinja b/proxmox-frr-templates/templates/frr.conf.jinja index 1f98489e09fb..8b070884574b 100644 --- a/proxmox-frr-templates/templates/frr.conf.jinja +++ b/proxmox-frr-templates/templates/frr.conf.jinja @@ -10,3 +10,4 @@ {% include "route_maps.jinja" %} {% include "ip_routes.jinja" %} {% include "protocol_routemaps.jinja" %} +{% include "nd_interfaces.jinja" %} diff --git a/proxmox-frr-templates/templates/nd_interfaces.jinja b/proxmox-frr-templates/templates/nd_interfaces.jinja new file mode 100644 index 000000000000..dd047a93a6af --- /dev/null +++ b/proxmox-frr-templates/templates/nd_interfaces.jinja @@ -0,0 +1,28 @@ +{% for name, iface in nd_interfaces|items %} +! +interface {{ name }} + no ipv6 nd suppress-ra +{% if iface.managed_config_flag %} + ipv6 nd managed-config-flag +{% endif %} +{% if iface.other_config_flag %} + ipv6 nd other-config-flag +{% endif %} +{% if iface.interval is not none %} + ipv6 nd ra-interval {{ iface.interval }} +{% endif %} +{% if iface.router_lifetime is not none %} + ipv6 nd ra-lifetime {{ iface.router_lifetime }} +{% endif %} +{% if iface.mtu is not none %} + ipv6 nd mtu {{ iface.mtu }} +{% endif %} +{% for rdnss in iface.rdnss %} + ipv6 nd rdnss {{ rdnss }} +{% endfor %} +{% for prefix in iface.prefixes %} + ipv6 nd prefix {{ prefix.cidr }} {{ prefix.valid }} {{ prefix.preferred }}{% if not prefix.autonomous %} no-autoconfig{% endif %}{% if not prefix.on_link %} off-link{% endif %} + +{% endfor %} +exit +{% endfor %} diff --git a/proxmox-frr/src/ser/mod.rs b/proxmox-frr/src/ser/mod.rs index b651121b4a82..a65ee46270b5 100644 --- a/proxmox-frr/src/ser/mod.rs +++ b/proxmox-frr/src/ser/mod.rs @@ -1,5 +1,6 @@ pub mod bgp; pub mod isis; +pub mod nd; pub mod openfabric; pub mod ospf; pub mod route_map; @@ -234,6 +235,11 @@ pub struct FrrConfig { #[serde(default)] pub prefix_lists: BTreeMap>, + /// `interface / ipv6 nd ...` blocks emitted for subnets with Router + /// Advertisements enabled. Presence of an entry implies `no ipv6 nd suppress-ra`. + #[serde(default)] + pub nd_interfaces: BTreeMap, + #[serde(default)] pub custom_frr_config: Vec, } diff --git a/proxmox-frr/src/ser/nd.rs b/proxmox-frr/src/ser/nd.rs new file mode 100644 index 000000000000..4eef037511da --- /dev/null +++ b/proxmox-frr/src/ser/nd.rs @@ -0,0 +1,56 @@ +use std::net::Ipv6Addr; + +use proxmox_network_types::ip_address::Ipv6Cidr; +use serde::{Deserialize, Serialize}; + +fn default_true() -> bool { + true +} + +/// A prefix advertised in Router Advertisements on an interface. +/// +/// Both lifetimes are emitted in seconds whether or not the prefix is autonomous. The +/// preferred lifetime must not exceed the valid one, FRR rejects the prefix otherwise. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct NdPrefix { + pub cidr: Ipv6Cidr, + #[serde( + default = "default_true", + deserialize_with = "proxmox_serde::perl::deserialize_bool" + )] + pub autonomous: bool, + #[serde( + default = "default_true", + deserialize_with = "proxmox_serde::perl::deserialize_bool" + )] + pub on_link: bool, + #[serde(deserialize_with = "proxmox_serde::perl::deserialize_u32")] + pub valid: u32, + #[serde(deserialize_with = "proxmox_serde::perl::deserialize_u32")] + pub preferred: u32, +} + +/// Router Advertisement configuration of an interface, one `ipv6 nd` command per field. +/// +/// An entry for an interface turns its RAs on, the generated config emits +/// `no ipv6 nd suppress-ra` for it. +#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] +pub struct NdInterface { + #[serde(default, deserialize_with = "proxmox_serde::perl::deserialize_bool")] + pub managed_config_flag: bool, + #[serde(default, deserialize_with = "proxmox_serde::perl::deserialize_bool")] + pub other_config_flag: bool, + #[serde(default)] + pub rdnss: Vec, + /// `None` leaves the router lifetime to FRR, three times the RA interval. A value above + /// 0 has to be at least the interval, which is why the template renders the interval + /// first, FRR checks the lifetime against the interval it has at that point. + #[serde(default)] + pub router_lifetime: Option, + #[serde(default)] + pub interval: Option, + #[serde(default)] + pub mtu: Option, + #[serde(default)] + pub prefixes: Vec, +} diff --git a/proxmox-frr/src/ser/serializer.rs b/proxmox-frr/src/ser/serializer.rs index 2ac85d8cf6c5..5b5d5a5081ab 100644 --- a/proxmox-frr/src/ser/serializer.rs +++ b/proxmox-frr/src/ser/serializer.rs @@ -5,7 +5,7 @@ use crate::ser::FrrConfig; use proxmox_sortable_macro::sortable; #[sortable] -pub static TEMPLATES: [(&str, &str); 12] = sorted!([ +pub static TEMPLATES: [(&str, &str); 13] = sorted!([ ( "fabricd.jinja", include_str!("/usr/share/proxmox-frr/templates/fabricd.jinja"), @@ -50,6 +50,10 @@ pub static TEMPLATES: [(&str, &str); 12] = sorted!([ "protocol_routemaps.jinja", include_str!("/usr/share/proxmox-frr/templates/protocol_routemaps.jinja"), ), + ( + "nd_interfaces.jinja", + include_str!("/usr/share/proxmox-frr/templates/nd_interfaces.jinja"), + ), ( "frr.conf.jinja", include_str!("/usr/share/proxmox-frr/templates/frr.conf.jinja"), -- 2.47.3