Skip to content

feat: bond primary preselect as enum values closes #81 #158

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: bond primary preselect as enum values closes #81 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
551ebb2
feat: bond primary preselect as enum values closes #81
mrcrgl Apr 5, 2025
93ccb4f
chore: rebased from main
mrcrgl Apr 12, 2025
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
152 changes: 100 additions & 52 deletions src/link/link_info/bond.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ const BOND_XMIT_POLICY_ENCAP34: u8 = 4;
const BOND_XMIT_POLICY_VLAN_SRCMAC: u8 = 5;
const BOND_OPT_ARP_ALL_TARGETS_ANY: u32 = 0;
const BOND_OPT_ARP_ALL_TARGETS_ALL: u32 = 1;
const BOND_PRI_RESELECT_ALWAYS: u8 = 0;
const BOND_PRI_RESELECT_BETTER: u8 = 1;
const BOND_PRI_RESELECT_FAILURE: u8 = 2;
const BOND_FOM_NONE: u8 = 0;
const BOND_FOM_ACTIVE: u8 = 1;
const BOND_FOM_FOLLOW: u8 = 2;

#[derive(Debug, Clone, Eq, PartialEq)]
#[non_exhaustive]
Expand Down Expand Up @@ -280,6 +286,51 @@ impl std::fmt::Display for BondArpValidate {
}
}

#[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
pub enum BondPrimaryReselect {
#[default]
Always,
Better,
Failure,
Other(u8),
}

impl From<BondPrimaryReselect> for u8 {
fn from(value: BondPrimaryReselect) -> Self {
match value {
BondPrimaryReselect::Always => BOND_PRI_RESELECT_ALWAYS,
BondPrimaryReselect::Better => BOND_PRI_RESELECT_BETTER,
BondPrimaryReselect::Failure => BOND_PRI_RESELECT_FAILURE,
BondPrimaryReselect::Other(d) => d,
}
}
}

impl From<u8> for BondPrimaryReselect {
fn from(value: u8) -> Self {
match value {
BOND_PRI_RESELECT_ALWAYS => BondPrimaryReselect::Always,
BOND_PRI_RESELECT_BETTER => BondPrimaryReselect::Better,
BOND_PRI_RESELECT_FAILURE => BondPrimaryReselect::Failure,
d => BondPrimaryReselect::Other(d),
}
}
}

impl std::fmt::Display for BondPrimaryReselect {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let kernel_name = match self {
BondPrimaryReselect::Always => "always",
BondPrimaryReselect::Better => "better",
BondPrimaryReselect::Failure => "failure",
BondPrimaryReselect::Other(d) => {
return write!(f, "unknown-variant ({d})")
}
};
f.write_str(kernel_name)
}
}

#[derive(Debug, Clone, Copy, Eq, PartialEq, Default)]
pub enum BondXmitHashPolicy {
#[default]
Expand Down Expand Up @@ -378,6 +429,51 @@ impl std::fmt::Display for BondArpAllTargets {
}
}

#[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)
}
}

// Some attributes (ARP_IP_TARGET, NS_IP6_TARGET) contain a nested
// list of IP addresses, where each element uses the index as NLA kind
// and the address as value. InfoBond exposes vectors of IP addresses,
Expand Down Expand Up @@ -458,7 +554,7 @@ pub enum InfoBond {
ArpValidate(BondArpValidate),
ArpAllTargets(BondArpAllTargets),
Primary(u32),
PrimaryReselect(u8),
PrimaryReselect(BondPrimaryReselect),
FailOverMac(BondFailOverMac),
XmitHashPolicy(BondXmitHashPolicy),
ResendIgmp(u32),
Expand Down Expand Up @@ -526,8 +622,8 @@ impl Nla for InfoBond {
match self {
Self::Mode(value) => buffer[0] = (*value).into(),
Self::XmitHashPolicy(value) => buffer[0] = (*value).into(),
Self::PrimaryReselect(value) => buffer[0] = (*value).into(),
Self::UseCarrier(value)
| Self::PrimaryReselect(value)
| Self::NumPeerNotif(value)
| Self::AllPortsActive(value)
| Self::AdLacpActive(value)
Expand Down Expand Up @@ -667,7 +763,8 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for InfoBond {
),
IFLA_BOND_PRIMARY_RESELECT => Self::PrimaryReselect(
parse_u8(payload)
.context("invalid IFLA_BOND_PRIMARY_RESELECT value")?,
.context("invalid IFLA_BOND_PRIMARY_RESELECT value")?
.into(),
),
IFLA_BOND_FAIL_OVER_MAC => Self::FailOverMac(
parse_u8(payload)
Expand Down Expand Up @@ -767,52 +864,3 @@ 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ mod xstats;

pub use self::bond::{
BondAdInfo, BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
BondXmitHashPolicy, InfoBond,
BondPrimaryReselect, BondXmitHashPolicy, InfoBond,
};
pub use self::bond_port::{BondPortState, InfoBondPort, MiiStatus};
pub use self::bridge::{
Expand Down
21 changes: 11 additions & 10 deletions src/link/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,17 @@ pub use self::header::{LinkHeader, LinkMessageBuffer};
pub use self::link_flag::LinkFlags;
pub use self::link_info::{
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,
BondPortState, BondPrimaryReselect, 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
9 changes: 5 additions & 4 deletions src/link/tests/bond.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ use netlink_packet_utils::{Emitable, Parseable};
use crate::link::link_flag::LinkFlags;
use crate::link::{
BondArpAllTargets, BondArpValidate, BondFailOverMac, BondMode,
BondPortState, BondXmitHashPolicy, InfoBond, InfoBondPort, InfoData,
InfoKind, InfoPortData, InfoPortKind, LinkAttribute, LinkHeader, LinkInfo,
LinkLayerType, LinkMessage, LinkMessageBuffer, Map, MiiStatus, State,
BondPortState, BondPrimaryReselect, BondXmitHashPolicy, InfoBond,
InfoBondPort, InfoData, InfoKind, InfoPortData, InfoPortKind,
LinkAttribute, LinkHeader, LinkInfo, LinkLayerType, LinkMessage,
LinkMessageBuffer, Map, MiiStatus, State,
};
use crate::{AddressFamily, RouteNetlinkMessage};

Expand Down Expand Up @@ -66,7 +67,7 @@ fn test_bond_link_info() {
InfoBond::ArpInterval(0),
InfoBond::ArpValidate(BondArpValidate::None),
InfoBond::ArpAllTargets(BondArpAllTargets::Any),
InfoBond::PrimaryReselect(0),
InfoBond::PrimaryReselect(BondPrimaryReselect::Always),
InfoBond::FailOverMac(BondFailOverMac::None),
InfoBond::XmitHashPolicy(BondXmitHashPolicy::Layer2),
InfoBond::ResendIgmp(1),
Expand Down
Loading