Skip to content

Fix linux interfaces #114

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

Merged
shellrow merged 3 commits into from
Jun 8, 2025
Merged

Fix linux interfaces #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04f051a
fix: always populate interface fields on linux
shellrow Jun 7, 2025
4ca4072
refactor: avoid clone in iface funcs
shellrow Jun 7, 2025
2f3a337
format with cargo fmt
shellrow Jun 8, 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
4 changes: 2 additions & 2 deletions src/interface/linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub fn is_virtual_interface(interface_name: &str) -> bool {
}
}

pub fn get_interface_type(if_name: String) -> InterfaceType {
pub fn get_interface_type(if_name: &str) -> InterfaceType {
let if_type_path: String = format!("/sys/class/net/{}/type", if_name);
let r = read_to_string(if_type_path);
match r {
Expand Down Expand Up @@ -50,7 +50,7 @@ pub fn get_interface_type(if_name: String) -> InterfaceType {
};
}

pub fn get_interface_speed(if_name: String) -> Option<u64> {
pub fn get_interface_speed(if_name: &str) -> Option<u64> {
let if_speed_path: String = format!("/sys/class/net/{}/speed", if_name);
let r = read_to_string(if_speed_path);
match r {
Expand Down
43 changes: 26 additions & 17 deletions src/interface/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,42 +88,51 @@ pub fn interfaces() -> Vec<Interface> {

#[cfg(any(target_os = "linux", target_os = "android"))]
pub fn interfaces() -> Vec<Interface> {
#[cfg(feature = "gateway")]
use crate::NetworkDevice;
#[cfg(feature = "gateway")]
use std::collections::HashMap;

use super::linux;

let mut interfaces: Vec<Interface> = unix_interfaces();

#[cfg(feature = "gateway")]
let local_ip: IpAddr = match super::get_local_ipaddr() {
Some(local_ip) => local_ip,
None => return interfaces,
};
let local_ip_opt: Option<IpAddr> = super::get_local_ipaddr();

#[cfg(feature = "gateway")]
let gateway_map = gateway::linux::get_gateway_map();
let gateway_map: HashMap<String, NetworkDevice> = gateway::linux::get_gateway_map();

for iface in &mut interfaces {
iface.if_type = linux::get_interface_type(iface.name.clone());
let if_speed: Option<u64> = linux::get_interface_speed(iface.name.clone());
iface.if_type = linux::get_interface_type(&iface.name);
let if_speed: Option<u64> = linux::get_interface_speed(&iface.name);
iface.transmit_speed = if_speed;
iface.receive_speed = if_speed;

#[cfg(feature = "gateway")]
if let Some(gateway) = gateway_map.get(&iface.name) {
iface.gateway = Some(gateway.clone());
}

#[cfg(feature = "gateway")]
match local_ip {
IpAddr::V4(local_ipv4) => {
if iface.ipv4.iter().any(|x| x.addr() == local_ipv4) {
iface.default = true;
iface.dns_servers = get_system_dns_conf();
if let Some(local_ip) = local_ip_opt {
match local_ip {
IpAddr::V4(local_ipv4) => {
if iface.ipv4.iter().any(|x| x.addr() == local_ipv4) {
iface.default = true;
iface.dns_servers = get_system_dns_conf();
}
}
}
IpAddr::V6(local_ipv6) => {
if iface.ipv6.iter().any(|x| x.addr() == local_ipv6) {
iface.default = true;
iface.dns_servers = get_system_dns_conf();
IpAddr::V6(local_ipv6) => {
if iface.ipv6.iter().any(|x| x.addr() == local_ipv6) {
iface.default = true;
iface.dns_servers = get_system_dns_conf();
}
}
}
}
}

interfaces
}

Expand Down