From: Thomas Karpiniec Date: Sat, 8 Jun 2024 07:33:42 +0000 (+1000) Subject: Don't include "down" interfaces on Windows X-Git-Tag: v0.1.0~21 X-Git-Url: https://code.octet-stream.net/netwatcher/commitdiff_plain/9ea683eddb05362f02bca60e4337955dfc5871dc?hp=74d0fddfbb570514118b4ddc228ce19ccd8bb969 Don't include "down" interfaces on Windows Tidy up in preparation for Linux support --- diff --git a/src/lib.rs b/src/lib.rs index 47c5ae1..46218d2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,14 +5,14 @@ use std::{ }; #[cfg_attr(windows, path = "list_win.rs")] -#[cfg_attr(target_vendor = "apple", path = "list_mac.rs")] +#[cfg_attr(unix, path = "list_unix.rs")] mod list; #[cfg_attr(windows, path = "watch_win.rs")] #[cfg_attr(target_vendor = "apple", path = "watch_mac.rs")] mod watch; -#[cfg(target_vendor = "apple")] +#[cfg(unix)] mod util; type IfIndex = u32; diff --git a/src/list_mac.rs b/src/list_mac.rs deleted file mode 100644 index 4ae0fc7..0000000 --- a/src/list_mac.rs +++ /dev/null @@ -1,99 +0,0 @@ -use std::{collections::HashMap, net::IpAddr}; - -use block2::Block; -use nix::libc::c_long; -use nix::{ifaddrs::getifaddrs, net::if_::if_nametoindex}; - -use crate::util::format_mac; -use crate::{Error, IfIndex, Interface}; - -struct CandidateInterface { - name: String, - index: u32, - hw_addr: Option, - ips: Vec, -} - -pub(crate) fn list_interfaces() -> Result, Error> { - let addrs = getifaddrs().map_err(|_| Error::Internal)?; - let mut candidates = HashMap::new(); - - for addr in addrs { - let index = if_nametoindex(addr.interface_name.as_str()).map_err(|_| Error::Internal)?; - let candidate = candidates - .entry(addr.interface_name.clone()) - .or_insert_with(|| CandidateInterface { - name: addr.interface_name.clone(), - index, - hw_addr: None, - ips: vec![], - }); - if let Some(a) = addr.address { - if let Some(a) = a.as_link_addr() { - if let Some(raw_addr) = a.addr() { - candidate.hw_addr = Some(format_mac(&raw_addr)?); - } - } - if let Some(a) = a.as_sockaddr_in() { - candidate.ips.push(IpAddr::V4(a.ip())); - } - if let Some(a) = a.as_sockaddr_in6() { - candidate.ips.push(IpAddr::V6(a.ip())); - } - } - } - - let ifs = candidates - .drain() - .flat_map(|(_, c)| { - c.hw_addr.map(|hw_addr| { - ( - c.index, - Interface { - index: c.index, - hw_addr, - name: c.name, - ips: c.ips, - }, - ) - }) - }) - .collect(); - Ok(ifs) -} - -// The "objc2" project aims to provide bindings for all frameworks but Network.framework -// isn't ready yet so let's kick it old-school - -struct nw_path_monitor; -type nw_path_monitor_t = *mut nw_path_monitor; -struct nw_path; -type nw_path_t = *mut nw_path; -struct dispatch_queue; -type dispatch_queue_t = *mut dispatch_queue; -const QOS_CLASS_BACKGROUND: usize = 0x09; - -#[link(name = "Network", kind = "framework")] -extern "C" { - fn nw_path_monitor_create() -> nw_path_monitor_t; - fn nw_path_monitor_set_update_handler( - monitor: nw_path_monitor_t, - update_handler: &Block, - ); - fn nw_path_monitor_set_queue(monitor: nw_path_monitor_t, queue: dispatch_queue_t); - fn nw_path_monitor_start(monitor: nw_path_monitor_t); - fn nw_path_monitor_cancel(monitor: nw_path_monitor_t); - - fn dispatch_get_global_queue(identifier: usize, flag: usize) -> dispatch_queue_t; -} - -#[cfg(test)] -mod test { - use super::list_interfaces; - - #[test] - fn list() { - let ifaces = list_interfaces().unwrap(); - println!("{:?}", ifaces); - } -} diff --git a/src/list_unix.rs b/src/list_unix.rs new file mode 100644 index 0000000..4ae0fc7 --- /dev/null +++ b/src/list_unix.rs @@ -0,0 +1,99 @@ +use std::{collections::HashMap, net::IpAddr}; + +use block2::Block; +use nix::libc::c_long; +use nix::{ifaddrs::getifaddrs, net::if_::if_nametoindex}; + +use crate::util::format_mac; +use crate::{Error, IfIndex, Interface}; + +struct CandidateInterface { + name: String, + index: u32, + hw_addr: Option, + ips: Vec, +} + +pub(crate) fn list_interfaces() -> Result, Error> { + let addrs = getifaddrs().map_err(|_| Error::Internal)?; + let mut candidates = HashMap::new(); + + for addr in addrs { + let index = if_nametoindex(addr.interface_name.as_str()).map_err(|_| Error::Internal)?; + let candidate = candidates + .entry(addr.interface_name.clone()) + .or_insert_with(|| CandidateInterface { + name: addr.interface_name.clone(), + index, + hw_addr: None, + ips: vec![], + }); + if let Some(a) = addr.address { + if let Some(a) = a.as_link_addr() { + if let Some(raw_addr) = a.addr() { + candidate.hw_addr = Some(format_mac(&raw_addr)?); + } + } + if let Some(a) = a.as_sockaddr_in() { + candidate.ips.push(IpAddr::V4(a.ip())); + } + if let Some(a) = a.as_sockaddr_in6() { + candidate.ips.push(IpAddr::V6(a.ip())); + } + } + } + + let ifs = candidates + .drain() + .flat_map(|(_, c)| { + c.hw_addr.map(|hw_addr| { + ( + c.index, + Interface { + index: c.index, + hw_addr, + name: c.name, + ips: c.ips, + }, + ) + }) + }) + .collect(); + Ok(ifs) +} + +// The "objc2" project aims to provide bindings for all frameworks but Network.framework +// isn't ready yet so let's kick it old-school + +struct nw_path_monitor; +type nw_path_monitor_t = *mut nw_path_monitor; +struct nw_path; +type nw_path_t = *mut nw_path; +struct dispatch_queue; +type dispatch_queue_t = *mut dispatch_queue; +const QOS_CLASS_BACKGROUND: usize = 0x09; + +#[link(name = "Network", kind = "framework")] +extern "C" { + fn nw_path_monitor_create() -> nw_path_monitor_t; + fn nw_path_monitor_set_update_handler( + monitor: nw_path_monitor_t, + update_handler: &Block, + ); + fn nw_path_monitor_set_queue(monitor: nw_path_monitor_t, queue: dispatch_queue_t); + fn nw_path_monitor_start(monitor: nw_path_monitor_t); + fn nw_path_monitor_cancel(monitor: nw_path_monitor_t); + + fn dispatch_get_global_queue(identifier: usize, flag: usize) -> dispatch_queue_t; +} + +#[cfg(test)] +mod test { + use super::list_interfaces; + + #[test] + fn list() { + let ifaces = list_interfaces().unwrap(); + println!("{:?}", ifaces); + } +} diff --git a/src/list_win.rs b/src/list_win.rs index 718f2bb..2ae79a6 100644 --- a/src/list_win.rs +++ b/src/list_win.rs @@ -12,6 +12,7 @@ use windows::Win32::NetworkManagement::IpHelper::{ use windows::Win32::NetworkManagement::IpHelper::{ GAA_FLAG_SKIP_ANYCAST, GAA_FLAG_SKIP_MULTICAST, IP_ADAPTER_ADDRESSES_LH, }; +use windows::Win32::NetworkManagement::Ndis::IfOperStatusDown; use windows::Win32::Networking::WinSock::{ AF_INET, AF_INET6, AF_UNSPEC, SOCKADDR, SOCKADDR_IN, SOCKADDR_IN6, }; @@ -53,6 +54,10 @@ pub(crate) fn list_interfaces() -> Result { let mut adapter_ptr = &buf[0] as *const _ as *const IP_ADAPTER_ADDRESSES_LH; while !adapter_ptr.is_null() { let adapter = &*adapter_ptr as &IP_ADAPTER_ADDRESSES_LH; + if adapter.OperStatus == IfOperStatusDown { + adapter_ptr = adapter.Next; + continue; + } let mut hw_addr = String::with_capacity(adapter.PhysicalAddressLength as usize * 3); for i in 0..adapter.PhysicalAddressLength as usize { if i != 0 { diff --git a/src/watch_mac.rs b/src/watch_mac.rs index 547db48..96e344b 100644 --- a/src/watch_mac.rs +++ b/src/watch_mac.rs @@ -1,10 +1,12 @@ use crate::Update; -pub struct WatchHandle; +pub(crate) struct WatchHandle; -pub fn watch_interfaces(callback: F) -> WatchHandle { +pub(crate) fn watch_interfaces( + callback: F, +) -> Result { // stop current worker thread // post this into a thread that will use it drop(callback); - WatchHandle + Ok(WatchHandle) } diff --git a/src/watch_win.rs b/src/watch_win.rs index 67e0d4c..41612b8 100644 --- a/src/watch_win.rs +++ b/src/watch_win.rs @@ -19,14 +19,14 @@ use crate::Error; use crate::List; use crate::Update; -pub struct WatchState { +struct WatchState { /// The last result that we captured, for diffing prev_list: List, /// User's callback cb: Box, } -pub struct WatchHandle { +pub(crate) struct WatchHandle { hnd: HANDLE, _state: Pin>>, } @@ -63,7 +63,7 @@ pub(crate) fn watch_interfaces( // Trigger an initial update. // This is allowed to race with true updates because it // will always calculate a diff and discard no-ops. - handle_notif(&mut *state.lock().unwrap()); + handle_notif(&mut state.lock().unwrap()); // Then return the handle Ok(WatchHandle { hnd, _state: state }) }