Skip to content

Fix FreeBSD builds by gating LinkBridgeVlan and Mpls code #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cathay4t wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix FreeBSD builds by gating LinkBridgeVlan and Mpls code #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ mod traffic_control;

#[cfg(feature = "tokio_socket")]
pub use crate::connection::{new_connection, new_multicast_connection};
#[cfg(any(
target_os = "linux",
target_os = "fuchsia",
target_os = "android"
))]
pub use crate::link::LinkBridgeVlan;
#[cfg(not(target_os = "freebsd"))]
pub use crate::ns::{NetworkNamespace, NETNS_PATH, NONE_FS, SELF_NS_PATH};
#[cfg(not(target_os = "freebsd"))]
Expand All @@ -50,11 +56,10 @@ pub use crate::{
handle::Handle,
link::{
LinkAddRequest, LinkBond, LinkBondPort, LinkBridge, LinkBridgePort,
LinkBridgeVlan, LinkDelPropRequest, LinkDelRequest, LinkDummy,
LinkGetRequest, LinkHandle, LinkMacSec, LinkMacVlan, LinkMacVtap,
LinkMessageBuilder, LinkNetkit, LinkSetRequest, LinkUnspec, LinkVeth,
LinkVlan, LinkVrf, LinkVxcan, LinkVxlan, LinkWireguard, LinkXfrm,
QosMapping,
LinkDelPropRequest, LinkDelRequest, LinkDummy, LinkGetRequest,
LinkHandle, LinkMacSec, LinkMacVlan, LinkMacVtap, LinkMessageBuilder,
LinkNetkit, LinkSetRequest, LinkUnspec, LinkVeth, LinkVlan, LinkVrf,
LinkVxcan, LinkVxlan, LinkWireguard, LinkXfrm, QosMapping,
},
multicast::MulticastGroup,
neighbour::{
Expand Down
14 changes: 7 additions & 7 deletions src/route/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{
net::{IpAddr, Ipv4Addr, Ipv6Addr},
};

#[cfg(not(target_os = "android"))]
#[cfg(not(any(target_os = "android", target_os = "freebsd")))]
use netlink_packet_route::route::{
MplsLabel, RouteLwEnCapType, RouteLwTunnelEncap, RouteMplsIpTunnel,
RouteSeg6IpTunnel, Seg6Header, Seg6Mode,
Expand Down Expand Up @@ -65,7 +65,7 @@ impl<T> RouteMessageBuilder<T> {
}

/// Sets the output MPLS encapsulation labels.
#[cfg(not(target_os = "android"))]
#[cfg(not(any(target_os = "android", target_os = "freebsd")))]
pub fn output_mpls(mut self, labels: Vec<MplsLabel>) -> Self {
if labels.is_empty() {
return self;
Expand Down Expand Up @@ -481,7 +481,7 @@ impl Default for RouteMessageBuilder<IpAddr> {
}
}

#[cfg(not(target_os = "android"))]
#[cfg(not(any(target_os = "android", target_os = "freebsd")))]
impl RouteMessageBuilder<MplsLabel> {
/// Create default RouteMessage with header set to:
/// * route: [RouteHeader::RT_TABLE_MAIN]
Expand All @@ -498,7 +498,6 @@ impl RouteMessageBuilder<MplsLabel> {
builder
}

#[cfg(not(target_os = "android"))]
/// Sets the destination MPLS label.
pub fn label(mut self, label: MplsLabel) -> Self {
self.message.header.address_family = AddressFamily::Mpls;
Expand All @@ -517,7 +516,8 @@ impl RouteMessageBuilder<MplsLabel> {
self
}
}
#[cfg(not(target_os = "android"))]

#[cfg(not(any(target_os = "android", target_os = "freebsd")))]
impl Default for RouteMessageBuilder<MplsLabel> {
fn default() -> Self {
Self::new()
Expand Down Expand Up @@ -565,7 +565,7 @@ impl RouteNextHopBuilder {
(AddressFamily::Inet, IpAddr::V6(v6)) => {
RouteAttribute::Via(RouteVia::Inet6(v6))
}
#[cfg(not(target_os = "android"))]
#[cfg(not(any(target_os = "android", target_os = "freebsd")))]
(AddressFamily::Mpls, _) => RouteAttribute::Via(addr.into()),
(af, _) => return Err(InvalidRouteMessage::AddressFamily(af)),
};
Expand All @@ -583,7 +583,7 @@ impl RouteNextHopBuilder {
}

/// Sets the nexthop MPLS encapsulation labels.
#[cfg(not(target_os = "android"))]
#[cfg(not(any(target_os = "android", target_os = "freebsd")))]
pub fn mpls(mut self, labels: Vec<MplsLabel>) -> Self {
if labels.is_empty() {
return self;
Expand Down
Loading