Skip to content
Merged
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
56 changes: 53 additions & 3 deletions src/link/link_info/bond.rs
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ pub enum InfoBond {
ArpAllTargets(BondArpAllTargets),
Primary(u32),
PrimaryReselect(u8),
FailOverMac(u8),
FailOverMac(BondFailOverMac),
XmitHashPolicy(BondXmitHashPolicy),
ResendIgmp(u32),
NumPeerNotif(u8),
Expand Down Expand Up @@ -528,14 +528,14 @@ impl Nla for InfoBond {
Self::XmitHashPolicy(value) => buffer[0] = (*value).into(),
Self::UseCarrier(value)
| Self::PrimaryReselect(value)
| Self::FailOverMac(value)
| Self::NumPeerNotif(value)
| Self::AllPortsActive(value)
| Self::AdLacpActive(value)
| Self::AdLacpRate(value)
| Self::AdSelect(value)
| Self::TlbDynamicLb(value)
| Self::MissedMax(value) => buffer[0] = *value,
Self::FailOverMac(value) => buffer[0] = (*value).into(),
Self::AdActorSysPrio(value) | Self::AdUserPortKey(value) => {
NativeEndian::write_u16(buffer, *value)
}
Expand Down Expand Up @@ -671,7 +671,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoBond {
),
IFLA_BOND_FAIL_OVER_MAC => Self::FailOverMac(
parse_u8(payload)
.context("invalid IFLA_BOND_FAIL_OVER_MAC value")?,
.context("invalid IFLA_BOND_FAIL_OVER_MAC value")?
.into(),
),
IFLA_BOND_XMIT_HASH_POLICY => Self::XmitHashPolicy(
parse_u8(payload)
Expand Down Expand Up @@ -766,3 +767,52 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoBond {
})
}
}

const BOND_FOM_NONE: u8 = 0;
const BOND_FOM_ACTIVE: u8 = 1;
const BOND_FOM_FOLLOW: u8 = 2;

#[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
pub enum BondFailOverMac {
#[default]
None,
Active,
Follow,
Other(u8),
}

impl From<BondFailOverMac> for u8 {
fn from(value: BondFailOverMac) -> Self {
match value {
BondFailOverMac::None => BOND_FOM_NONE,
BondFailOverMac::Active => BOND_FOM_ACTIVE,
BondFailOverMac::Follow => BOND_FOM_FOLLOW,
BondFailOverMac::Other(d) => d,
}
}
}

impl From<u8> for BondFailOverMac {
fn from(value: u8) -> Self {
match value {
BOND_FOM_NONE => BondFailOverMac::None,
BOND_FOM_ACTIVE => BondFailOverMac::Active,
BOND_FOM_FOLLOW => BondFailOverMac::Follow,
d => BondFailOverMac::Other(d),
}
}
}

impl std::fmt::Display for BondFailOverMac {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let kernel_name = match self {
BondFailOverMac::None => "none",
BondFailOverMac::Active => "active",
BondFailOverMac::Follow => "follow",
BondFailOverMac::Other(d) => {
return write!(f, "unknown-variant ({d})")
}
};
f.write_str(kernel_name)
}
}
2 changes: 1 addition & 1 deletion src/link/link_info/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mod xfrm;
mod xstats;

pub use self::bond::{
BondAdInfo, BondArpAllTargets, BondArpValidate, BondMode,
BondAdInfo, BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
BondXmitHashPolicy, InfoBond,
};
pub use self::bond_port::{BondPortState, InfoBondPort, MiiStatus};
Expand Down
22 changes: 11 additions & 11 deletions src/link/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ pub use self::ext_mask::LinkExtentMask;
pub use self::header::{LinkHeader, LinkMessageBuffer};
pub use self::link_flag::LinkFlags;
pub use self::link_info::{
BondAdInfo, BondArpAllTargets, BondArpValidate, BondMode, BondPortState,
BondXmitHashPolicy, BridgeId, BridgeIdBuffer, BridgePortMulticastRouter,
BridgePortState, BridgeQuerierState, GeneveDf, HsrProtocol, InfoBond,
InfoBondPort, InfoBridge, InfoBridgePort, InfoData, InfoGeneve, InfoGreTap,
InfoGreTap6, InfoGreTun, InfoGreTun6, InfoGtp, InfoHsr, InfoIpVlan,
InfoIpVtap, InfoIpoib, InfoKind, InfoMacSec, InfoMacVlan, InfoMacVtap,
InfoPortData, InfoPortKind, InfoSitTun, InfoTun, InfoVeth, InfoVlan,
InfoVrf, InfoVrfPort, InfoVti, InfoVxlan, InfoXfrm, IpVlanFlags,
IpVlanMode, IpVtapFlags, IpVtapMode, LinkInfo, LinkXstats, MacSecCipherId,
MacSecOffload, MacSecValidate, MacVlanMode, MacVtapMode, MiiStatus,
VlanQosMapping,
BondAdInfo, BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
BondPortState, BondXmitHashPolicy, BridgeId, BridgeIdBuffer,
BridgePortMulticastRouter, BridgePortState, BridgeQuerierState, GeneveDf,
HsrProtocol, InfoBond, InfoBondPort, InfoBridge, InfoBridgePort, InfoData,
InfoGeneve, InfoGreTap, InfoGreTap6, InfoGreTun, InfoGreTun6, InfoGtp,
InfoHsr, InfoIpVlan, InfoIpVtap, InfoIpoib, InfoKind, InfoMacSec,
InfoMacVlan, InfoMacVtap, InfoPortData, InfoPortKind, InfoSitTun, InfoTun,
InfoVeth, InfoVlan, InfoVrf, InfoVrfPort, InfoVti, InfoVxlan, InfoXfrm,
IpVlanFlags, IpVlanMode, IpVtapFlags, IpVtapMode, LinkInfo, LinkXstats,
MacSecCipherId, MacSecOffload, MacSecValidate, MacVlanMode, MacVtapMode,
MiiStatus, VlanQosMapping,
};
pub use self::link_layer_type::LinkLayerType;
pub use self::link_state::State;
Expand Down
8 changes: 4 additions & 4 deletions src/link/tests/bond.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use netlink_packet_utils::{Emitable, Parseable};

use crate::link::link_flag::LinkFlags;
use crate::link::{
BondArpAllTargets, BondArpValidate, BondMode, BondPortState,
BondXmitHashPolicy, InfoBond, InfoBondPort, InfoData, InfoKind,
InfoPortData, InfoPortKind, LinkAttribute, LinkHeader, LinkInfo,
BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
BondPortState, BondXmitHashPolicy, InfoBond, InfoBondPort, InfoData,
InfoKind, InfoPortData, InfoPortKind, LinkAttribute, LinkHeader, LinkInfo,
LinkLayerType, LinkMessage, LinkMessageBuffer, Map, MiiStatus, State,
};
use crate::{AddressFamily, RouteNetlinkMessage};
Expand Down Expand Up @@ -67,7 +67,7 @@ fn test_bond_link_info() {
InfoBond::ArpValidate(BondArpValidate::None),
InfoBond::ArpAllTargets(BondArpAllTargets::Any),
InfoBond::PrimaryReselect(0),
InfoBond::FailOverMac(0),
InfoBond::FailOverMac(BondFailOverMac::None),
InfoBond::XmitHashPolicy(BondXmitHashPolicy::Layer2),
InfoBond::ResendIgmp(1),
InfoBond::NumPeerNotif(1),
Expand Down
Loading