diff --git a/Cargo.lock b/Cargo.lock index 368e9a2430..af7d625080 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2165,10 +2165,10 @@ dependencies = [ "ipnet", "libc", "log", - "netlink-packet-core 0.8.1", - "netlink-packet-generic 0.4.0", + "netlink-packet-core", + "netlink-packet-generic", "netlink-packet-route", - "netlink-packet-utils 0.6.0", + "netlink-packet-utils", "netlink-packet-wireguard", "netlink-sys", "nix 0.30.1", @@ -4989,17 +4989,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "netlink-packet-core" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" -dependencies = [ - "anyhow", - "byteorder", - "netlink-packet-utils 0.5.2", -] - [[package]] name = "netlink-packet-core" version = "0.8.1" @@ -5009,25 +4998,13 @@ dependencies = [ "paste", ] -[[package]] -name = "netlink-packet-generic" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7eb8ad331c84c6b8cb7f685b448133e5ad82e1ffd5acafac374af4a5a308b" -dependencies = [ - "anyhow", - "byteorder", - "netlink-packet-core 0.7.0", - "netlink-packet-utils 0.5.2", -] - [[package]] name = "netlink-packet-generic" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f891b2e0054cac5a684a06628f59568f841c93da4e551239da6e518f539e775" dependencies = [ - "netlink-packet-core 0.8.1", + "netlink-packet-core", ] [[package]] @@ -5039,19 +5016,7 @@ dependencies = [ "bitflags 2.9.1", "libc", "log", - "netlink-packet-core 0.8.1", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror 1.0.69", + "netlink-packet-core", ] [[package]] @@ -5067,16 +5032,14 @@ dependencies = [ [[package]] name = "netlink-packet-wireguard" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b25b050ff1f6a1e23c6777b72db22790fe5b6b5ccfd3858672587a79876c8f" +checksum = "598962d9067d3153a00106da10e7b8276cea68f396f4a22f5b4a079270d92e29" dependencies = [ - "anyhow", - "byteorder", "libc", "log", - "netlink-packet-generic 0.3.3", - "netlink-packet-utils 0.5.2", + "netlink-packet-core", + "netlink-packet-generic", ] [[package]] diff --git a/common/nym-lp/src/message.rs b/common/nym-lp/src/message.rs index fbd692175b..77f332eec2 100644 --- a/common/nym-lp/src/message.rs +++ b/common/nym-lp/src/message.rs @@ -391,14 +391,14 @@ impl ForwardPacketData { } // SAFETY: we ensured we have sufficient data, and the length is correct for casting #[allow(clippy::unwrap_used)] - let ipv6 = IpAddr::V6(Ipv6Addr::from_octets(bytes[33..49].try_into().unwrap())); + let ipv6 = IpAddr::V6(Ipv6Addr::from(<[u8; 16]>::try_from(&bytes[33..49]).unwrap())); let port = u16::from_le_bytes([bytes[49], bytes[50]]); (SocketAddr::new(ipv6, port), 51) } else { // IPv4. Length check done at the start // SAFETY: we ensured we have sufficient data, and the length is correct for casting #[allow(clippy::unwrap_used)] - let ipv4 = IpAddr::V4(Ipv4Addr::from_octets(bytes[33..37].try_into().unwrap())); + let ipv4 = IpAddr::V4(Ipv4Addr::from(<[u8; 4]>::try_from(&bytes[33..37]).unwrap())); let port = u16::from_le_bytes([bytes[37], bytes[38]]); (SocketAddr::new(ipv4, port), 39) };