diff --git a/Cargo.lock b/Cargo.lock index d2783cc039c..8485727d5f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3104,6 +3104,18 @@ dependencies = [ "netlink-packet-core", ] +[[package]] +name = "netlink-packet-route" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8919612f6028ab4eacbbfe1234a9a43e3722c6e0915e7ff519066991905092" +dependencies = [ + "bitflags", + "libc", + "log", + "netlink-packet-core", +] + [[package]] name = "netlink-proto" version = "0.12.0" @@ -3134,7 +3146,7 @@ dependencies = [ [[package]] name = "netwatch" version = "0.15.0" -source = "git+https://github.com/n0-computer/net-tools?branch=main#d77c60b12a06ce084e6cb753bb15481da0123f09" +source = "git+https://github.com/n0-computer/net-tools?branch=main#97ef90b5ff749c6b7a8b7af7a014d0c9f5c7cf2d" dependencies = [ "atomic-waker", "bytes", @@ -3147,7 +3159,7 @@ dependencies = [ "n0-watcher", "netdev", "netlink-packet-core", - "netlink-packet-route 0.29.0", + "netlink-packet-route 0.30.0", "netlink-proto", "netlink-sys", "noq-udp", @@ -3202,8 +3214,9 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" -version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=main#a0481ac5a17003845bd3755318640b6abf994e6c" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b969bd157c3bd3bab239a1a8b14f67f2033fa012770367fcbd5b42d71ae3548" dependencies = [ "bytes", "cfg_aliases", @@ -3223,8 +3236,9 @@ dependencies = [ [[package]] name = "noq-proto" -version = "0.16.0" -source = "git+https://github.com/n0-computer/noq?branch=main#a0481ac5a17003845bd3755318640b6abf994e6c" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdec6f5039d98ee5377b2f532d495a555eb664c53161b1b5780dcaeac678b60e" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3252,8 +3266,9 @@ dependencies = [ [[package]] name = "noq-udp" -version = "0.9.0" -source = "git+https://github.com/n0-computer/noq?branch=main#a0481ac5a17003845bd3755318640b6abf994e6c" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91b05f4f3353290936ba1f3233518868fb4e2da99cb4c90d1f8cebb064e527" dependencies = [ "cfg_aliases", "libc", @@ -3722,7 +3737,7 @@ dependencies = [ [[package]] name = "portmapper" version = "0.15.0" -source = "git+https://github.com/n0-computer/net-tools?branch=main#d77c60b12a06ce084e6cb753bb15481da0123f09" +source = "git+https://github.com/n0-computer/net-tools?branch=main#97ef90b5ff749c6b7a8b7af7a014d0c9f5c7cf2d" dependencies = [ "base64", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 94b93fefb4b..ee9060e5dcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,6 +44,3 @@ unused-async = "warn" [patch.crates-io] portmapper = { git = "https://github.com/n0-computer/net-tools", branch = "main" } netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "main" } -noq = { git = "https://github.com/n0-computer/noq", branch = "main" } -noq-udp = { git = "https://github.com/n0-computer/noq", branch = "main" } -noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" } diff --git a/deny.toml b/deny.toml index d6beed0b668..08d7340f40b 100644 --- a/deny.toml +++ b/deny.toml @@ -27,6 +27,5 @@ ignore = [ [sources] allow-git = [ - "https://github.com/n0-computer/noq", "https://github.com/n0-computer/net-tools", ] diff --git a/iroh-relay/Cargo.toml b/iroh-relay/Cargo.toml index c5854e338da..8ff8d7dad42 100644 --- a/iroh-relay/Cargo.toml +++ b/iroh-relay/Cargo.toml @@ -46,8 +46,8 @@ postcard = { version = "1", default-features = false, features = [ "use-std", "experimental-derive", ] } -noq = { version = "0.17.0", default-features = false, features = ["rustls"] } -noq-proto = { version = "0.16.0", default-features = false } +noq = { version = "0.18.0", default-features = false, features = ["rustls"] } +noq-proto = { version = "0.17.0", default-features = false } rand = "0.10" reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider"] } rustls = { version = "0.23.33", default-features = false } diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml index fec101328a9..2cab947fd56 100644 --- a/iroh/Cargo.toml +++ b/iroh/Cargo.toml @@ -40,9 +40,9 @@ papaya = { version = "0.2.3", default-features = false } pin-project = "1" portable-atomic = "1" pkarr = { version = "5", default-features = false } -noq = { version = "0.17.0", default-features = false, features = ["rustls"] } -noq-proto = { version = "0.16", default-features = false } -noq-udp = { version = "0.9", default-features = false } +noq = { version = "0.18.0", default-features = false, features = ["rustls"] } +noq-proto = { version = "0.17", default-features = false } +noq-udp = { version = "0.10", default-features = false } rand = "0.10" reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider", "stream"] } rustc-hash = "2" @@ -80,7 +80,7 @@ sync_wrapper = { version = "1.0.2", features = ["futures"] } [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies] hickory-resolver = { version = "=0.26.0-beta.1", default-features = false } portmapper = { version = "0.15", optional = true, default-features = false } -noq = { version = "0.17.0", default-features = false, features = ["runtime-tokio", "rustls"] } +noq = { version = "0.18.0", default-features = false, features = ["runtime-tokio", "rustls"] } tokio = { version = "1", features = [ "io-util", "macros", diff --git a/iroh/bench/Cargo.toml b/iroh/bench/Cargo.toml index 56271dbfb94..f9d5b044e7f 100644 --- a/iroh/bench/Cargo.toml +++ b/iroh/bench/Cargo.toml @@ -12,7 +12,7 @@ iroh = { path = "..", default-features = false } iroh-metrics = { version = "0.38", optional = true } n0-future = "0.3" n0-error = "0.1" -noq = "0.17.0" +noq = "0.18.0" rand = "0.10" rcgen = "0.14" rustls = { version = "0.23.33", default-features = false }