Update ipnetwork and convert LazyLock to const

8 files changed, 20 insertions, 18 deletions

diff --git a/Cargo.lock b/Cargo.lock
index fed1ebf2a6..6e651f17c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2494,9 +2494,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "ipnetwork"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
+checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763"
 dependencies = [
  "serde",
 ]
@@ -4124,9 +4124,9 @@ dependencies = [
 
 [[package]]
 name = "pfctl"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44e65c0d3523afa79a600a3964c3ac0fabdabe2d7c68da624b2bb0b441b9d61"
+checksum = "944d2c073758b6bda57f517cff54cf69d74eae3593fe1e9aa9918666543456a9"
 dependencies = [
  "derive_builder",
  "ioctl-sys 0.8.0",
diff --git a/Cargo.toml b/Cargo.toml
index 5ade871d11..e33522942f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,7 @@ strum = { version = "0.27" }
 
 # Networking
 pnet_packet = "0.35.0"
-ipnetwork = "0.20"
+ipnetwork = "0.21.1"
 tun = { version = "0.5.5", features = ["async"] }
 socket2 = "0.5.7"
 reqwest = { version = "0.12.23", default-features = false, features = ["rustls-tls"] }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index f7a22ee346..d7303d9d7c 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -51,7 +51,7 @@ duct = "0.13"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 async-trait = "0.1"
-pfctl = "0.6.1"
+pfctl = "0.7.0"
 system-configuration = "0.5.1"
 hickory-proto = { workspace = true }
 hickory-server = { workspace = true, features = ["resolver"] }
diff --git a/talpid-tunnel/src/tun_provider/android/ipnetwork_sub.rs b/talpid-tunnel/src/tun_provider/android/ipnetwork_sub.rs
index 44f9160ef1..272a28a911 100644
--- a/talpid-tunnel/src/tun_provider/android/ipnetwork_sub.rs
+++ b/talpid-tunnel/src/tun_provider/android/ipnetwork_sub.rs
@@ -40,11 +40,11 @@ impl AbstractIpNetwork for Ipv4Network {
     }
 
     fn mask(self) -> Self::Representation {
-        Ipv4Network::mask(self).into()
+        Ipv4Network::mask(&self).into()
     }
 
     fn network(self) -> Self::Representation {
-        Ipv4Network::network(self).into()
+        Ipv4Network::network(&self).into()
     }
 
     fn prefix(self) -> u8 {
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 3933e9ecf0..188ea92237 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 
 [dependencies]
 serde = { workspace = true, features = ["derive"] }
-ipnetwork = { workspace = true }
+ipnetwork = { workspace = true, features = ["serde"] }
 base64 = "0.22.0"
 x25519-dalek = { version = "2.0.1", features = ["static_secrets", "zeroize", "getrandom"] }
 thiserror = { workspace = true }
diff --git a/test/Cargo.lock b/test/Cargo.lock
index 0dd07c4221..263e29b763 100644
--- a/test/Cargo.lock
+++ b/test/Cargo.lock
@@ -1692,9 +1692,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "ipnetwork"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
+checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763"
 dependencies = [
  "serde",
 ]
diff --git a/test/test-manager/Cargo.toml b/test/test-manager/Cargo.toml
index 1583681b63..bc7ab9515d 100644
--- a/test/test-manager/Cargo.toml
+++ b/test/test-manager/Cargo.toml
@@ -21,7 +21,7 @@ tokio-serial = { workspace = true }
 thiserror = { workspace = true }
 bytes = { workspace = true }
 test_macro = { path = "./test_macro" }
-ipnetwork = "0.20"
+ipnetwork = "0.21.1"
 inventory = "0.3"
 data-encoding-macro = "0.1.12"
 itertools = "0.10.5"
diff --git a/test/test-manager/src/vm/network/linux.rs b/test/test-manager/src/vm/network/linux.rs
index 561eb91d27..b6df187dcc 100644
--- a/test/test-manager/src/vm/network/linux.rs
+++ b/test/test-manager/src/vm/network/linux.rs
@@ -2,11 +2,10 @@ use ipnetwork::{Ipv4Network, Ipv6Network};
 use std::{
     ffi::OsStr,
     io,
-    net::{IpAddr, Ipv4Addr},
+    net::{IpAddr, Ipv4Addr, Ipv6Addr},
     ops::RangeInclusive,
     process::Stdio,
     str::FromStr,
-    sync::LazyLock,
 };
 use tokio::{
     io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
@@ -14,16 +13,19 @@ use tokio::{
 };
 
 /// (Contained) IPv4 subnet for the test runner: 172.29.1.1/24
-pub static TEST_SUBNET_IPV4: LazyLock<Ipv4Network> =
-    LazyLock::new(|| "172.29.1.1/24".parse().unwrap());
+pub const TEST_SUBNET_IPV4: Ipv4Network =
+    Ipv4Network::new_checked(Ipv4Addr::new(172, 29, 1, 1), 24).unwrap();
 
 /// IPv4 range returned by the DHCP server.
 pub const TEST_SUBNET_IPV4_DHCP: RangeInclusive<Ipv4Addr> =
     Ipv4Addr::new(172, 29, 1, 2)..=Ipv4Addr::new(172, 29, 1, 128);
 
 /// IPv6 subnet for the test runner. "0xfd multest"
-pub static TEST_SUBNET_IPV6: LazyLock<Ipv6Network> =
-    LazyLock::new(|| "fd6d:756c:7465:7374::1/64".parse().unwrap());
+pub const TEST_SUBNET_IPV6: Ipv6Network = Ipv6Network::new_checked(
+    Ipv6Addr::new(0xfd6d, 0x756c, 0x7465, 0x7374, 0, 0, 0, 1),
+    64,
+)
+.unwrap();
 
 /// Bridge interface on the host
 pub(crate) const BRIDGE_NAME: &str = "br-mullvadtest";