Nix 0.27 (#41)

* Update to nix 0.26 * some clippy fixes * use latest version of `nix` --------- Co-authored-by: Jelmer Vernooĳ <jelmer@jelmer.uk>
repnop · Nov 14, 2023 · f2416eb · f2416eb
1 parent a32d68d
commit f2416eb
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["mac", "address", "network", "interface"]
 serde = { version = "1.0.117", features = ["derive"], optional = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "openbsd", target_os = "android"))'.dependencies]
-nix = "0.23.1"
+nix = { version = "0.27", features = ["net"] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winerror", "ws2def", "iphlpapi"] }

diff --git a/examples/lookup.rs b/examples/lookup.rs
@@ -4,10 +4,10 @@ fn main() {
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     let name = "eth0";
 
-    #[cfg(any(target_os = "freebsd"))]
+    #[cfg(target_os = "freebsd")]
     let name = "em0";
 
-    #[cfg(any(target_os = "openbsd"))]
+    #[cfg(target_os = "openbsd")]
     let name = "fxp0";
 
     #[cfg(target_os = "windows")]

diff --git a/src/iter/linux.rs b/src/iter/linux.rs
@@ -1,5 +1,5 @@
 use crate::{MacAddress, MacAddressError};
-use nix::{ifaddrs, sys::socket::SockAddr};
+use nix::ifaddrs;
 
 /// An iterator over all available MAC addresses on the system.
 pub struct MacAddressIterator {
@@ -19,11 +19,9 @@ impl MacAddressIterator {
 }
 
 fn filter_macs(intf: ifaddrs::InterfaceAddress) -> Option<MacAddress> {
-    if let SockAddr::Link(link) = intf.address? {
-        Some(MacAddress::new(link.addr()))
-    } else {
-        None
-    }
+    intf.address?
+        .as_link_addr()
+        .and_then(|link| link.addr().map(MacAddress::new))
 }
 
 impl Iterator for MacAddressIterator {

diff --git a/src/linux.rs b/src/linux.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 use crate::MacAddressError;
-use nix::{ifaddrs::*, sys::socket::SockAddr};
+use nix::ifaddrs::*;
 
 /// Uses the `getifaddrs` call to retrieve a list of network interfaces on the
 /// host device and returns the first MAC address listed that isn't
@@ -10,15 +10,19 @@ pub fn get_mac(name: Option<&str>) -> Result<Option<[u8; 6]>, MacAddressError> {
     let ifiter = getifaddrs()?;
 
     for interface in ifiter {
-        if let Some(SockAddr::Link(link)) = interface.address {
-            let bytes = link.addr();
-
-            if let Some(name) = name {
-                if interface.interface_name == name {
-                    return Ok(Some(bytes));
+        if let Some(iface_address) = interface.address {
+            if let Some(link) = iface_address.as_link_addr() {
+                let bytes = link.addr();
+
+                if let Some(name) = name {
+                    if interface.interface_name == name {
+                        return Ok(bytes);
+                    }
+                } else if let Some(bytes) = bytes {
+                    if bytes.iter().any(|&x| x != 0) {
+                        return Ok(Some(bytes));
+                    }
                 }
-            } else if bytes.iter().any(|&x| x != 0) {
-                return Ok(Some(bytes));
             }
         }
     }
@@ -30,11 +34,13 @@ pub fn get_ifname(mac: &[u8; 6]) -> Result<Option<String>, MacAddressError> {
     let ifiter = getifaddrs()?;
 
     for interface in ifiter {
-        if let Some(SockAddr::Link(link)) = interface.address {
-            let bytes = link.addr();
+        if let Some(iface_address) = interface.address {
+            if let Some(link) = iface_address.as_link_addr() {
+                let bytes = link.addr();
 
-            if &bytes == mac {
-                return Ok(Some(interface.interface_name));
+                if bytes == Some(*mac) {
+                    return Ok(Some(interface.interface_name));
+                }
             }
         }
     }