Deuxfleurs/garage
37
58
Fork 76
Code Issues 103 Pull requests 16 Releases 30 Wiki Activity

windows: don't discover default IP, removes winpcap dependency

Browse source
This commit is contained in:
Brian Picciano 2025-01-14 12:32:51 +01:00
parent 3e65289b85
commit 7221ac5e88
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/rpc/system.rs
View file

@ -863,17 +863,27 @@ impl NodeStatus {
/// Obtain the list of currently available IP addresses on all non-loopback /// Obtain the list of currently available IP addresses on all non-loopback
/// interfaces, optionally filtering them to be inside a given IpNet. /// interfaces, optionally filtering them to be inside a given IpNet.
fn get_default_ip(filter_ipnet: Option<ipnet::IpNet>) -> Option<IpAddr> { fn get_default_ip(filter_ipnet: Option<ipnet::IpNet>) -> Option<IpAddr> {
// pnet creates a dependency on winpcap, which is a giant pain to get working with
// cross-compilation.
#[cfg(windows)]
{
None
}
#[cfg(not(windows))]
{
pnet_datalink::interfaces() pnet_datalink::interfaces()
.into_iter() .into_iter()
// filter down and loopback interfaces // filter down and loopback interfaces
.filter(|i| i.is_up() && !i.is_loopback()) .filter(|i| i.is_up() && !i.is_loopback())
// get all IPs // get all IPs
.flat_map(|e| e.ips) .flat_map(|e| e.ips)
// optionally, filter to be inside filter_ipnet // optionally, filter to be inside filter_ipnet
.find(|ipn| { .find(|ipn| {
filter_ipnet.is_some_and(|ipnet| ipnet.contains(&ipn.ip())) || filter_ipnet.is_none() filter_ipnet.is_some_and(|ipnet| ipnet.contains(&ipn.ip())) || filter_ipnet.is_none()
}) })
.map(|ipn| ipn.ip()) .map(|ipn| ipn.ip())
}
} }
fn get_rpc_public_addr(config: &Config) -> Option<SocketAddr> { fn get_rpc_public_addr(config: &Config) -> Option<SocketAddr> {