Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/route/attribute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,13 @@ impl Nla for RouteAttribute {

fn is_nested(&self) -> bool {
if let Self::Encap(encap) = self {
encap
.iter()
.any(|e| matches!(e, RouteLwTunnelEncap::Seg6(_)))
encap.iter().any(|e| {
matches!(
e,
RouteLwTunnelEncap::Seg6(_)
| RouteLwTunnelEncap::Seg6Local(_)
)
})
} else {
false
}
Expand Down
9 changes: 8 additions & 1 deletion src/route/lwtunnel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use netlink_packet_core::{
NlasIterator, Parseable, ParseableParametrized,
};

use super::{RouteMplsIpTunnel, RouteSeg6IpTunnel};
use super::{RouteMplsIpTunnel, RouteSeg6IpTunnel, RouteSeg6LocalIpTunnel};
use crate::ip::parse_ipv6_addr;

const LWTUNNEL_ENCAP_NONE: u16 = 0;
Expand Down Expand Up @@ -259,6 +259,7 @@ where
pub enum RouteLwTunnelEncap {
Mpls(RouteMplsIpTunnel),
Seg6(RouteSeg6IpTunnel),
Seg6Local(RouteSeg6LocalIpTunnel),
Ip6(RouteIp6Tunnel),
Other(DefaultNla),
}
Expand All @@ -268,6 +269,7 @@ impl Nla for RouteLwTunnelEncap {
match self {
Self::Mpls(v) => v.value_len(),
Self::Seg6(v) => v.value_len(),
Self::Seg6Local(v) => v.value_len(),
Self::Ip6(v) => v.value_len(),
Self::Other(v) => v.value_len(),
}
Expand All @@ -277,6 +279,7 @@ impl Nla for RouteLwTunnelEncap {
match self {
Self::Mpls(v) => v.emit_value(buffer),
Self::Seg6(v) => v.emit_value(buffer),
Self::Seg6Local(v) => v.emit_value(buffer),
Self::Ip6(v) => v.emit_value(buffer),
Self::Other(v) => v.emit_value(buffer),
}
Expand All @@ -286,6 +289,7 @@ impl Nla for RouteLwTunnelEncap {
match self {
Self::Mpls(v) => v.kind(),
Self::Seg6(v) => v.kind(),
Self::Seg6Local(v) => v.kind(),
Self::Ip6(v) => v.kind(),
Self::Other(v) => v.kind(),
}
Expand All @@ -308,6 +312,9 @@ where
RouteLwEnCapType::Seg6 => {
Self::Seg6(RouteSeg6IpTunnel::parse(buf)?)
}
RouteLwEnCapType::Seg6Local => {
Self::Seg6Local(RouteSeg6LocalIpTunnel::parse(buf)?)
}
RouteLwEnCapType::Ip6 => Self::Ip6(RouteIp6Tunnel::parse(buf)?),
_ => Self::Other(DefaultNla::parse(buf)?),
})
Expand Down
2 changes: 2 additions & 0 deletions src/route/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ mod next_hops;
mod preference;
mod realm;
mod seg6;
mod seg6local;
mod via;

#[cfg(test)]
Expand All @@ -37,5 +38,6 @@ pub use self::{
preference::RoutePreference,
realm::RouteRealm,
seg6::{RouteSeg6IpTunnel, Seg6Header, Seg6Mode},
seg6local::{RouteSeg6LocalIpTunnel, Seg6LocalAction, SRH},
via::{RouteVia, RouteViaBuffer},
};
Loading
Loading