Skip to content

add support for bond network interfaces #835

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

add support for bond network interfaces #835

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
38 changes: 9 additions & 29 deletions src/modules/system_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,13 @@ fn get_temperature_sensor_label(
sensor_label
}

/// Returns a sort priority for Linux network interface names we want to surface
/// in the system info panel, or `None` for interfaces we should ignore.
fn interface_priority(name: &str) -> Option<usize> {
const PREFIXES: &[&str] = &["en", "eth", "wl", "br", "bond"];
PREFIXES.iter().position(|p| name.starts_with(p))
}

#[allow(clippy::too_many_arguments)]
fn get_system_info(
system: &mut System,
Expand Down Expand Up @@ -329,35 +336,8 @@ fn get_system_info(

let network = networks
.iter()
.filter(|(name, _)| {
name.contains("en")
|| name.contains("eth")
|| name.contains("wl")
|| name.contains("wlan")
|| name.contains("br")
})
.sorted_by_key(|(name, _)| {
if name.contains("en") {
return 0;
}

if name.contains("eth") {
return 1;
}

if name.contains("wl") {
return 2;
}

if name.contains("wlan") {
return 3;
}
if name.contains("br") {
return 4;
}

99
})
.filter_map(|(name, data)| interface_priority(name).map(|p| (p, data)))
.sorted_by_key(|(p, _)| *p)
.fold(
(None, 0, 0),
|(first_ip, total_received, total_transmitted), (_, data)| {
Expand Down