From 0f2e91b479f4218a61c0b36b4e4120d9eae5ff83 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <johnathan@corganlabs.com>
Date: Sat, 11 Jul 2026 20:10:19 +0000
Subject: [PATCH] transport: rename udp byte-layer module from socket to io

Normalizes the udp transport onto the canonical per-transport module
layout (ble is the reference: io/pool/addr/stats). Pure file rename plus
module-path updates at the use sites; no logic, wire, config, metric, or
log change. Behavior identical.
---
 src/node/encrypt_worker.rs             | 10 +++++-----
 src/transport/udp/{socket.rs => io.rs} |  2 +-
 src/transport/udp/mod.rs               |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/transport/udp/{socket.rs => io.rs} (99%)

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;