diff --git a/Cargo.lock b/Cargo.lock index be73a3b555..075589ee87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -384,7 +384,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -552,7 +552,7 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -1983,7 +1983,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.1", + "windows-core 0.62.2", ] [[package]] @@ -2240,12 +2240,12 @@ dependencies = [ "iroh-quinn-proto", "iroh-quinn-udp", "iroh-relay", - "n0-future 0.2.0", + "n0-future 0.3.0", "n0-snafu", "n0-watcher", "nested_enum_utils", - "netdev 0.36.0", - "netwatch", + "netdev 0.38.2", + "netwatch 0.10.0", "parse-size", "pin-project", "pkarr", @@ -2317,7 +2317,7 @@ dependencies = [ "iroh", "iroh-metrics", "iroh-quinn", - "n0-future 0.2.0", + "n0-future 0.3.0", "n0-snafu", "rand 0.9.2", "rcgen 0.14.5", @@ -2350,7 +2350,7 @@ dependencies = [ "iroh", "iroh-metrics", "lru 0.16.1", - "n0-future 0.2.0", + "n0-future 0.3.0", "n0-snafu", "pkarr", "rand 0.9.2", @@ -2493,7 +2493,7 @@ dependencies = [ "iroh-quinn", "iroh-quinn-proto", "lru 0.16.1", - "n0-future 0.2.0", + "n0-future 0.3.0", "n0-snafu", "nested_enum_utils", "num_enum", @@ -2829,6 +2829,27 @@ dependencies = [ "web-time", ] +[[package]] +name = "n0-future" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439e746b307c1fd0c08771c3cafcd1746c3ccdb0d9c7b859d3caded366b6da76" +dependencies = [ + "cfg_aliases", + "derive_more 1.0.0", + "futures-buffered", + "futures-lite", + "futures-util", + "js-sys", + "pin-project", + "send_wrapper", + "tokio", + "tokio-util", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-time", +] + [[package]] name = "n0-snafu" version = "0.2.2" @@ -2867,14 +2888,14 @@ dependencies = [ [[package]] name = "netdev" -version = "0.36.0" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862209dce034f82a44c95ce2b5183730d616f2a68746b9c1959aa2572e77c0a1" +checksum = "daa1e3eaf125c54c21e6221df12dd2a0a682784a068782dd564c836c0f281b6d" dependencies = [ "dlopen2", "ipnet", "libc", - "netlink-packet-core", + "netlink-packet-core 0.7.0", "netlink-packet-route 0.22.0", "netlink-sys", "once_cell", @@ -2884,15 +2905,15 @@ dependencies = [ [[package]] name = "netdev" -version = "0.37.3" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa1e3eaf125c54c21e6221df12dd2a0a682784a068782dd564c836c0f281b6d" +checksum = "67ab878b4c90faf36dab10ea51d48c69ae9019bcca47c048a7c9b273d5d7a823" dependencies = [ "dlopen2", "ipnet", "libc", - "netlink-packet-core", - "netlink-packet-route 0.22.0", + "netlink-packet-core 0.8.1", + "netlink-packet-route 0.25.1", "netlink-sys", "once_cell", "system-configuration", @@ -2910,6 +2931,15 @@ dependencies = [ "netlink-packet-utils", ] +[[package]] +name = "netlink-packet-core" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3463cbb78394cb0141e2c926b93fc2197e473394b761986eca3b9da2c63ae0f4" +dependencies = [ + "paste", +] + [[package]] name = "netlink-packet-route" version = "0.22.0" @@ -2921,7 +2951,7 @@ dependencies = [ "byteorder", "libc", "log", - "netlink-packet-core", + "netlink-packet-core 0.7.0", "netlink-packet-utils", ] @@ -2936,10 +2966,22 @@ dependencies = [ "byteorder", "libc", "log", - "netlink-packet-core", + "netlink-packet-core 0.7.0", "netlink-packet-utils", ] +[[package]] +name = "netlink-packet-route" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec2f5b6839be2a19d7fa5aab5bc444380f6311c2b693551cb80f45caaa7b5ef" +dependencies = [ + "bitflags", + "libc", + "log", + "netlink-packet-core 0.8.1", +] + [[package]] name = "netlink-packet-utils" version = "0.5.2" @@ -2961,7 +3003,21 @@ dependencies = [ "bytes", "futures", "log", - "netlink-packet-core", + "netlink-packet-core 0.7.0", + "netlink-sys", + "thiserror 2.0.17", +] + +[[package]] +name = "netlink-proto" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65d130ee111430e47eed7896ea43ca693c387f097dd97376bffafbf25812128" +dependencies = [ + "bytes", + "futures", + "log", + "netlink-packet-core 0.8.1", "netlink-sys", "thiserror 2.0.17", ] @@ -2996,9 +3052,9 @@ dependencies = [ "n0-watcher", "nested_enum_utils", "netdev 0.37.3", - "netlink-packet-core", + "netlink-packet-core 0.7.0", "netlink-packet-route 0.24.0", - "netlink-proto", + "netlink-proto 0.11.5", "netlink-sys", "pin-project-lite", "serde", @@ -3014,6 +3070,41 @@ dependencies = [ "wmi", ] +[[package]] +name = "netwatch" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29acc9361df4a91bde6d2ec1ce110de7c826e574eeb3662ec1f574af00b96c48" +dependencies = [ + "atomic-waker", + "bytes", + "cfg_aliases", + "derive_more 2.0.1", + "iroh-quinn-udp", + "js-sys", + "libc", + "n0-future 0.2.0", + "n0-watcher", + "nested_enum_utils", + "netdev 0.38.2", + "netlink-packet-core 0.8.1", + "netlink-packet-route 0.25.1", + "netlink-proto 0.12.0", + "netlink-sys", + "pin-project-lite", + "serde", + "snafu", + "socket2 0.6.0", + "time", + "tokio", + "tokio-util", + "tracing", + "web-sys", + "windows 0.62.2", + "windows-result 0.4.1", + "wmi", +] + [[package]] name = "no-std-net" version = "0.6.0" @@ -3203,7 +3294,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -3429,7 +3520,7 @@ dependencies = [ "iroh-metrics", "libc", "nested_enum_utils", - "netwatch", + "netwatch 0.9.0", "num_enum", "rand 0.9.2", "serde", @@ -5521,14 +5612,14 @@ dependencies = [ [[package]] name = "windows" -version = "0.62.1" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ - "windows-collections 0.3.1", - "windows-core 0.62.1", - "windows-future 0.3.1", - "windows-numerics 0.3.0", + "windows-collections 0.3.2", + "windows-core 0.62.2", + "windows-future 0.3.2", + "windows-numerics 0.3.1", ] [[package]] @@ -5542,11 +5633,11 @@ dependencies = [ [[package]] name = "windows-collections" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-core 0.62.1", + "windows-core 0.62.2", ] [[package]] @@ -5564,15 +5655,15 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.62.1" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.0", - "windows-result 0.4.0", - "windows-strings 0.5.0", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] @@ -5588,20 +5679,20 @@ dependencies = [ [[package]] name = "windows-future" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "windows-core 0.62.1", - "windows-link 0.2.0", - "windows-threading 0.2.0", + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading 0.2.1", ] [[package]] name = "windows-implement" -version = "0.60.1" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -5610,9 +5701,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.2" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -5627,9 +5718,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" [[package]] name = "windows-link" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-numerics" @@ -5643,12 +5734,12 @@ dependencies = [ [[package]] name = "windows-numerics" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-core 0.62.1", - "windows-link 0.2.0", + "windows-core 0.62.2", + "windows-link 0.2.1", ] [[package]] @@ -5662,11 +5753,11 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -5680,11 +5771,11 @@ dependencies = [ [[package]] name = "windows-strings" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -5738,7 +5829,7 @@ version = "0.61.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -5793,7 +5884,7 @@ version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -5815,11 +5906,11 @@ dependencies = [ [[package]] name = "windows-threading" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -6038,8 +6129,8 @@ dependencies = [ "log", "serde", "thiserror 2.0.17", - "windows 0.62.1", - "windows-core 0.62.1", + "windows 0.62.2", + "windows-core 0.62.2", ] [[package]] diff --git a/iroh-dns-server/Cargo.toml b/iroh-dns-server/Cargo.toml index 4b8e7eab6f..2ed91c0aa9 100644 --- a/iroh-dns-server/Cargo.toml +++ b/iroh-dns-server/Cargo.toml @@ -30,7 +30,7 @@ humantime = "2.2.0" humantime-serde = "1.1.1" iroh-metrics = { version = "0.36", features = ["service"] } lru = "0.16" -n0-future = "0.2.0" +n0-future = "0.3.0" n0-snafu = "0.2.2" pkarr = { version = "5", features = ["relays", "dht"], default-features = false } rcgen = "0.14" diff --git a/iroh-relay/Cargo.toml b/iroh-relay/Cargo.toml index d5db894efe..d9a5399092 100644 --- a/iroh-relay/Cargo.toml +++ b/iroh-relay/Cargo.toml @@ -33,7 +33,7 @@ hyper = { version = "1", features = ["server", "client", "http1"] } hyper-util = "0.1.1" iroh-base = { version = "0.93.2", path = "../iroh-base", default-features = false, features = ["key", "relay"] } iroh-metrics = { version = "0.36", default-features = false } -n0-future = "0.2.0" +n0-future = "0.3.0" num_enum = "0.7" pin-project = "1" pkarr = { version = "5", default-features = false, features = ["signed_packet"] } diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml index cd74e8bf79..2bea278f51 100644 --- a/iroh/Cargo.toml +++ b/iroh/Cargo.toml @@ -39,11 +39,11 @@ ed25519-dalek = { version = "3.0.0-pre.1", features = ["serde", "rand_core", "ze http = "1" iroh-base = { version = "0.93.2", default-features = false, features = ["key", "relay"], path = "../iroh-base" } iroh-relay = { version = "0.93", path = "../iroh-relay", default-features = false } -n0-future = "0.2.0" +n0-future = "0.3.0" n0-snafu = "0.2.2" n0-watcher = "0.3" nested_enum_utils = "0.2.1" -netwatch = { version = "0.9" } +netwatch = { version = "0.10" } pin-project = "1" pkarr = { version = "5", default-features = false, features = ["relays"] } quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["rustls-ring"] } @@ -95,7 +95,7 @@ axum = { version = "0.8", optional = true } [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies] hickory-resolver = "0.25.1" igd-next = { version = "0.16", features = ["aio_tokio"] } -netdev = { version = "0.36.0" } +netdev = { version = "0.38.1" } portmapper = { version = "0.10", default-features = false } quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["runtime-tokio", "rustls-ring"] } tokio = { version = "1", features = [ diff --git a/iroh/bench/Cargo.toml b/iroh/bench/Cargo.toml index 5137c8c01b..c5df943963 100644 --- a/iroh/bench/Cargo.toml +++ b/iroh/bench/Cargo.toml @@ -10,7 +10,7 @@ bytes = "1.7" hdrhistogram = { version = "7.2", default-features = false } iroh = { path = ".." } iroh-metrics = "0.36" -n0-future = "0.2.0" +n0-future = "0.3.0" n0-snafu = "0.2.0" quinn = { package = "iroh-quinn", version = "0.14" } rand = "0.9.2"