diff --git a/Cargo.lock b/Cargo.lock index 9a5840d4144..9abd2eb7535 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -696,13 +696,24 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code 2.3.1", + "str-buf", + "winapi", +] + [[package]] name = "clipboard-win" version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ - "error-code", + "error-code 3.3.1", ] [[package]] @@ -1482,6 +1493,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + [[package]] name = "error-code" version = "3.3.1" @@ -1541,6 +1562,17 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +[[package]] +name = "fd-lock" +version = "3.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" +dependencies = [ + "cfg-if", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "fd-lock" version = "4.0.2" @@ -2838,7 +2870,9 @@ dependencies = [ "iroh-docs", "iroh-gossip", "iroh-metrics", - "nix 0.27.1", + "iroh-net-report", + "iroh-node-util", + "nix 0.29.0", "parking_lot", "pkarr", "portable-atomic", @@ -2850,7 +2884,7 @@ dependencies = [ "ratatui", "regex", "reqwest", - "rustyline", + "rustyline 14.0.0", "serde", "shell-words", "shellexpand", @@ -3166,7 +3200,7 @@ dependencies = [ "rustls", "surge-ping", "testresult", - "thiserror 1.0.68", + "thiserror 1.0.69", "tokio", "tokio-util", "tracing", @@ -3189,11 +3223,11 @@ dependencies = [ "nested_enum_utils", "quic-rpc", "quic-rpc-derive", - "rustyline", + "rustyline 12.0.0", "serde", "serde-error", "serde_with", - "strum 0.26.3", + "strum", "tempfile", "time", "tokio", @@ -3768,6 +3802,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + [[package]] name = "nix" version = "0.27.1" @@ -5246,6 +5291,29 @@ dependencies = [ "wait-timeout", ] +[[package]] +name = "rustyline" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "clipboard-win 4.5.0", + "fd-lock 3.0.13", + "home", + "libc", + "log", + "memchr", + "nix 0.26.4", + "radix_trie", + "scopeguard", + "unicode-segmentation", + "unicode-width 0.1.14", + "utf8parse", + "winapi", +] + [[package]] name = "rustyline" version = "14.0.0" @@ -5254,8 +5322,8 @@ checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ "bitflags 2.6.0", "cfg-if", - "clipboard-win", - "fd-lock", + "clipboard-win 5.4.0", + "fd-lock 4.0.2", "home", "libc", "log", @@ -5739,6 +5807,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + [[package]] name = "strsim" version = "0.11.1" diff --git a/net-tools/netwatch/src/netmon/linux.rs b/net-tools/netwatch/src/netmon/linux.rs index 2b63af79ba9..61274e8d581 100644 --- a/net-tools/netwatch/src/netmon/linux.rs +++ b/net-tools/netwatch/src/netmon/linux.rs @@ -5,6 +5,10 @@ use std::{ use anyhow::Result; use futures_lite::StreamExt; +use libc::{ + RTNLGRP_IPV4_IFADDR, RTNLGRP_IPV4_ROUTE, RTNLGRP_IPV4_RULE, RTNLGRP_IPV6_IFADDR, + RTNLGRP_IPV6_ROUTE, RTNLGRP_IPV6_RULE, +}; use netlink_packet_core::NetlinkPayload; use netlink_packet_route::{address, route, RouteNetlinkMessage}; use netlink_sys::{AsyncSocket, SocketAddr};