diff --git a/src/node/encrypt_worker.rs b/src/node/encrypt_worker.rs index 28b232b..80219da 100644 --- a/src/node/encrypt_worker.rs +++ b/src/node/encrypt_worker.rs @@ -52,7 +52,7 @@ use crate::proto::fmp::wire::ESTABLISHED_HEADER_SIZE; use crate::proto::fsp::wire::FSP_HEADER_SIZE; -use crate::transport::udp::socket::AsyncUdpSocket; +use crate::transport::udp::io::AsyncUdpSocket; #[cfg(not(target_os = "macos"))] use crossbeam_channel::{Receiver, SendError, Sender, TrySendError, bounded}; use ring::aead::{Aad, LessSafeKey, Nonce}; @@ -1710,7 +1710,7 @@ fn send_batch_gso( } /// Direct `sendmmsg(2)` wrapper for the sync worker. The -/// `transport::udp::socket` module's existing `send_batch` is +/// `transport::udp::io` module's existing `send_batch` is /// pub(crate) on `UdpRawSocket`, but we don't have a handle to the /// raw socket from here — we just have the FD. Re-implementing /// inline is ~15 lines and avoids tunnelling the inner socket @@ -1780,7 +1780,7 @@ fn send_batch_raw( #[cfg(all(test, unix))] mod unix_tests { use super::*; - use crate::transport::udp::socket::UdpRawSocket; + use crate::transport::udp::io::UdpRawSocket; use ring::aead::{LessSafeKey, UnboundKey}; use std::net::UdpSocket; @@ -2220,7 +2220,7 @@ mod tests { /// AsRawFd impl. #[test] fn flush_batch_routes_each_target_separately() { - use crate::transport::udp::socket::UdpRawSocket; + use crate::transport::udp::io::UdpRawSocket; use ring::aead::{LessSafeKey, UnboundKey}; use std::net::UdpSocket; @@ -2266,7 +2266,7 @@ mod tests { const B_WIRE: usize = 16 + B_PLAINTEXT + 16; // 96 fn make_job( - socket: crate::transport::udp::socket::AsyncUdpSocket, + socket: crate::transport::udp::io::AsyncUdpSocket, cipher: &LessSafeKey, counter: u64, dest: SocketAddr, diff --git a/src/transport/udp/socket.rs b/src/transport/udp/io.rs similarity index 99% rename from src/transport/udp/socket.rs rename to src/transport/udp/io.rs index 6ba77f9..a4e6460 100644 --- a/src/transport/udp/socket.rs +++ b/src/transport/udp/io.rs @@ -844,7 +844,7 @@ mod tests { /// drained over a fixed wall-clock window per mode. /// /// Run with: - /// cargo test --release -p fips --lib transport::udp::socket::tests::bench_udp_recv_amortization -- --ignored --nocapture + /// cargo test --release -p fips --lib transport::udp::io::tests::bench_udp_recv_amortization -- --ignored --nocapture /// /// Sender runs on a dedicated *blocking* OS thread (std::net::UdpSocket /// in default blocking mode) so it always saturates the kernel rx queue diff --git a/src/transport/udp/mod.rs b/src/transport/udp/mod.rs index 780af5a..a8ad380 100644 --- a/src/transport/udp/mod.rs +++ b/src/transport/udp/mod.rs @@ -10,14 +10,14 @@ use super::{ pub(crate) mod connected_peer; #[cfg(target_os = "macos")] pub(crate) mod darwin_sockopts; +pub(crate) mod io; #[cfg(unix)] pub(crate) mod peer_drain; -pub(crate) mod socket; mod stats; use super::resolve_socket_addr; use crate::config::UdpConfig; use crate::nostr::is_punch_packet; -use socket::{AsyncUdpSocket, UdpRawSocket}; +use io::{AsyncUdpSocket, UdpRawSocket}; use stats::UdpStats; use std::collections::HashMap; use std::net::SocketAddr;