utils: rename ip.rs -> net.rs

DanglingPointer · DanglingPointer · commit 795d568afc75 · 2026-04-05T17:13:37.000+01:00
diff --git a/mtorrent-core/src/pwp/message.rs b/mtorrent-core/src/pwp/message.rs
@@ -1,7 +1,7 @@
 use bitvec::prelude::*;
 use bytes::{Buf, BufMut};
 use derive_more::Display;
-use mtorrent_utils::{benc, ip};
+use mtorrent_utils::{benc, net};
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::{fmt, io};
@@ -684,16 +684,16 @@ impl PeerExchangeData {
         let mut dropped = HashSet::new();
 
         if let Some(ByteString(s)) = root.remove(Self::KEY_ADDED_V4) {
-            added.extend(ip::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));
+            added.extend(net::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));
         }
         if let Some(ByteString(s)) = root.remove(Self::KEY_ADDED_V6) {
-            added.extend(ip::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));
+            added.extend(net::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));
         }
         if let Some(ByteString(s)) = root.remove(Self::KEY_DROPPED_V4) {
-            dropped.extend(ip::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));
+            dropped.extend(net::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));
         }
         if let Some(ByteString(s)) = root.remove(Self::KEY_DROPPED_V6) {
-            dropped.extend(ip::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));
+            dropped.extend(net::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));
         }
         Some(PeerExchangeData { added, dropped })
     }
diff --git a/mtorrent-core/src/trackers/http.rs b/mtorrent-core/src/trackers/http.rs
@@ -1,5 +1,5 @@
 use local_async_utils::prelude::*;
-use mtorrent_utils::{benc, ip};
+use mtorrent_utils::{benc, net};
 use reqwest::{ClientBuilder, Url};
 use std::collections::{BTreeMap, HashMap};
 use std::net::{IpAddr, SocketAddr};
@@ -355,15 +355,15 @@ impl AnnounceResponseContent {
                 let mut all_peers = Vec::new();
                 match peers {
                     Some(benc::Element::ByteString(data)) => {
-                        all_peers.extend(ip::SocketAddrV4BytesIter(data).map(SocketAddr::V4));
+                        all_peers.extend(net::SocketAddrV4BytesIter(data).map(SocketAddr::V4));
                     }
                     Some(benc::Element::List(list)) => {
                         all_peers.extend(dictionary_peers(list));
                     }
                     _ => (),
                 }
                 if let Some(benc::Element::ByteString(data)) = ipv6_peers {
-                    all_peers.extend(ip::SocketAddrV6BytesIter(data).map(SocketAddr::V6))
+                    all_peers.extend(net::SocketAddrV6BytesIter(data).map(SocketAddr::V6))
                 }
                 Some(all_peers)
             }
diff --git a/mtorrent-core/src/trackers/mod.rs b/mtorrent-core/src/trackers/mod.rs
@@ -4,13 +4,13 @@ mod url;
 
 use futures_util::TryFutureExt;
 use local_async_utils::sec;
-use mtorrent_utils::ip;
+use mtorrent_utils::net;
 use mtorrent_utils::peer_id::PeerId;
 use std::collections::HashMap;
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::time::Duration;
 use std::{io, iter};
-use tokio::net::{self, UdpSocket};
+use tokio::net::{UdpSocket, lookup_host};
 use tokio::sync::{mpsc, oneshot};
 use tokio::task;
 use tokio_util::sync::CancellationToken;
@@ -184,8 +184,8 @@ impl Manager {
         }
 
         let interface = self.config.bind_interface.as_deref();
-        let local_ipv4 = ip::get_bind_addr_v4(interface);
-        let local_ipv6 = ip::get_bind_addr_v6(interface);
+        let local_ipv4 = net::get_bind_addr_v4(interface);
+        let local_ipv6 = net::get_bind_addr_v6(interface);
         let http_client = http::TrackerClient::new(local_ipv4.into(), interface)
             .inspect_err(|e| log::error!("Failed to create HTTP tracker client: {e}"))
             .ok();
@@ -343,13 +343,13 @@ async fn new_udp_client(
     ) -> io::Result<UdpSocket> {
         let socket = UdpSocket::bind(bind_addr).await?;
         if let Some(iface) = interface {
-            ip::bind_to_interface(&socket, iface)?;
+            net::bind_to_interface(&socket, iface)?;
         }
         socket.connect(&remote_addr).await?;
         Ok(socket)
     }
 
-    for tracker_addr in net::lookup_host(tracker_addr_str).await? {
+    for tracker_addr in lookup_host(tracker_addr_str).await? {
         let local_ip = match &tracker_addr {
             SocketAddr::V4(_) => local_ipv4.into(),
             SocketAddr::V6(_) => local_ipv6.into(),
diff --git a/mtorrent-core/src/trackers/udp.rs b/mtorrent-core/src/trackers/udp.rs
@@ -1,7 +1,7 @@
 use bytes::{Buf, BufMut};
 use derive_more::Display;
 use local_async_utils::prelude::*;
-use mtorrent_utils::ip;
+use mtorrent_utils::net;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::str::Utf8Error;
 use std::{io, str};
@@ -366,8 +366,8 @@ impl TryFrom<(&[u8], &IpAddr)> for AnnounceResponse {
             let leechers = src.get_u32();
             let seeders = src.get_u32();
             let ips: Vec<_> = match tracker_ip {
-                IpAddr::V4(_) => ip::SocketAddrV4BytesIter(src).map(SocketAddr::V4).collect(),
-                IpAddr::V6(_) => ip::SocketAddrV6BytesIter(src).map(SocketAddr::V6).collect(),
+                IpAddr::V4(_) => net::SocketAddrV4BytesIter(src).map(SocketAddr::V4).collect(),
+                IpAddr::V6(_) => net::SocketAddrV6BytesIter(src).map(SocketAddr::V6).collect(),
             };
             Ok(AnnounceResponse {
                 interval,
diff --git a/mtorrent-dht/src/msgs.rs b/mtorrent-dht/src/msgs.rs
@@ -1,7 +1,7 @@
 use super::error::Error;
 use super::u160::U160;
 use derive_more::derive::From;
-use mtorrent_utils::{benc, ip};
+use mtorrent_utils::{benc, net};
 use std::collections::BTreeMap;
 use std::net::{Ipv4Addr, SocketAddrV4};
 use std::{fmt, iter};
@@ -557,7 +557,7 @@ impl TryFrom<ResponseMsg> for GetPeersResponse {
                     benc::Element::ByteString(bytes) => Some(bytes.as_slice()),
                     _ => None,
                 })
-                .flat_map(ip::SocketAddrV4BytesIter)
+                .flat_map(net::SocketAddrV4BytesIter)
                 .collect::<Vec<_>>(),
             Some(_) => return Err(Error::ParseError("values not a list".into())),
             None => Vec::new(),
diff --git a/mtorrent-utils/src/lib.rs b/mtorrent-utils/src/lib.rs
@@ -14,7 +14,7 @@ pub mod connect_throttle;
 pub mod fifo_set;
 
 /// Local IP address discovery and socket helpers.
-pub mod ip;
+pub mod net;
 
 /// Single-value watch channel for `!Send` types.
 pub mod local_watch;
diff --git a/mtorrent-utils/src/net.rs b/mtorrent-utils/src/net.rs
@@ -46,6 +46,7 @@ fn get_adapter_addrs<'a>(
         .flat_map(ipconfig::Adapter::ip_addresses)
 }
 
+/// Get the local IP address to bind to, based on the specified network interface (if any).
 pub fn get_bind_addr_v4(interface: Option<&str>) -> Ipv4Addr {
     let Some(iface) = interface else {
         return Ipv4Addr::UNSPECIFIED;
@@ -74,6 +75,7 @@ pub fn get_bind_addr_v4(interface: Option<&str>) -> Ipv4Addr {
     Ipv4Addr::UNSPECIFIED
 }
 
+/// Get the local IP address to bind to, based on the specified network interface (if any).
 pub fn get_bind_addr_v6(interface: Option<&str>) -> Ipv6Addr {
     let Some(iface) = interface else {
         return Ipv6Addr::UNSPECIFIED;
@@ -121,6 +123,7 @@ pub fn set_so_rcvbuf_internal<'s>(socket: impl Into<SockRef<'s>>, value: usize,
     }
 }
 
+/// Bind a socket to a specific network interface. Does nothing on Windows.
 #[cfg(target_os = "windows")]
 pub fn bind_to_interface<'s>(_socket: impl Into<SockRef<'s>>, _interface: &str) -> io::Result<()> {
     // not supported on Windows
@@ -177,15 +180,15 @@ pub fn bind_to_interface<'s>(socket: impl Into<SockRef<'s>>, interface: &str) ->
 #[macro_export]
 macro_rules! set_so_sndbuf {
     ($sock:expr, $size:expr) => {{
-        $crate::ip::set_so_sndbuf_internal($sock, $size, std::module_path!());
+        $crate::net::set_so_sndbuf_internal($sock, $size, std::module_path!());
     }};
 }
 
 /// Set SO_RCVBUF on a socket.
 #[macro_export]
 macro_rules! set_so_rcvbuf {
     ($sock:expr, $size:expr) => {{
-        $crate::ip::set_so_rcvbuf_internal($sock, $size, std::module_path!());
+        $crate::net::set_so_rcvbuf_internal($sock, $size, std::module_path!());
     }};
 }
 
diff --git a/mtorrent-utils/src/upnp.rs b/mtorrent-utils/src/upnp.rs
@@ -108,7 +108,7 @@ impl Drop for PortOpener {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::ip;
+    use crate::net;
     use log::Level;
     use std::net::SocketAddrV4;
     use tokio::time;
@@ -118,7 +118,7 @@ mod tests {
     async fn test_async_port_opener() {
         simple_logger::init_with_level(Level::Debug).unwrap();
 
-        let local_ip = ip::get_local_addr().unwrap();
+        let local_ip = net::get_local_addr().unwrap();
         let local_internal_ip = SocketAddrV4::new(local_ip, 23015);
         let port_opener = PortOpener::new(local_internal_ip.into(), PortMappingProtocol::TCP, None)
             .await
diff --git a/mtorrent/src/app/dht.rs b/mtorrent/src/app/dht.rs
@@ -1,5 +1,5 @@
 use mtorrent_dht as dht;
-use mtorrent_utils::{info_stopwatch, ip, upnp, worker};
+use mtorrent_utils::{info_stopwatch, net, upnp, worker};
 use std::io;
 use std::net::{SocketAddr, SocketAddrV4};
 use std::path::PathBuf;
@@ -55,7 +55,7 @@ pub fn launch_dht_node_runtime(cfg: Config) -> io::Result<(worker::rt::Handle, d
 }
 
 async fn start_upnp(local_port: u16) -> io::Result<()> {
-    let local_addr = ip::get_local_addr()?;
+    let local_addr = net::get_local_addr()?;
 
     // try create a port mapping with the same port number
     let port_opener = upnp::PortOpener::new(
@@ -92,7 +92,7 @@ async fn dht_main(
     let _sw = info_stopwatch!("DHT");
 
     let socket = match UdpSocket::bind(SocketAddrV4::new(
-        ip::get_bind_addr_v4(bind_interface.as_deref()),
+        net::get_bind_addr_v4(bind_interface.as_deref()),
         local_port,
     ))
     .await
@@ -102,7 +102,7 @@ async fn dht_main(
     };
 
     if let Some(interface) = bind_interface
-        && let Err(e) = ip::bind_to_interface(&socket, &interface)
+        && let Err(e) = net::bind_to_interface(&socket, &interface)
     {
         log::error!("Failed to bind DHT UDP socket to interface {interface}: {e}");
         return;
diff --git a/mtorrent/src/app/main.rs b/mtorrent/src/app/main.rs
@@ -3,7 +3,7 @@ use crate::utils::{listener, startup};
 use mtorrent_core::{input, pwp, trackers};
 use mtorrent_dht as dht;
 use mtorrent_utils::peer_id::PeerId;
-use mtorrent_utils::{info_stopwatch, ip, upnp};
+use mtorrent_utils::{info_stopwatch, net, upnp};
 use std::borrow::Borrow;
 use std::io;
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
@@ -101,15 +101,15 @@ pub async fn single_torrent(
     }
     let ctx: &Context = ctx.borrow();
 
-    let listener_port = cfg.pwp_port.unwrap_or_else(|| ip::port_from_hash(&metainfo_uri.as_ref()));
-    let pwp_local_addr_v4 = ip::get_bind_addr_v4(cfg.bind_interface.as_deref());
-    let pwp_local_addr_v6 = ip::get_bind_addr_v6(cfg.bind_interface.as_deref());
+    let listener_port = cfg.pwp_port.unwrap_or_else(|| net::port_from_hash(&metainfo_uri.as_ref()));
+    let pwp_local_addr_v4 = net::get_bind_addr_v4(cfg.bind_interface.as_deref());
+    let pwp_local_addr_v6 = net::get_bind_addr_v6(cfg.bind_interface.as_deref());
 
     // create port mappings and get external port to send correct listening port to trackers and
     // peers later
     let external_pwp_port = if cfg.use_upnp {
         let _g = ctx.pwp_runtime.enter();
-        let internal_addr = (ip::get_local_addr()?, listener_port).into();
+        let internal_addr = (net::get_local_addr()?, listener_port).into();
         let (_public_pwp_addr, public_utp_addr) = join!(
             start_upnp(internal_addr, cfg.pwp_port, upnp::PortMappingProtocol::TCP),
             start_upnp(internal_addr, cfg.pwp_port, upnp::PortMappingProtocol::UDP),
diff --git a/mtorrent/src/ops/peer/tcp.rs b/mtorrent/src/ops/peer/tcp.rs
@@ -3,7 +3,7 @@ use super::ctx;
 use bytes::BytesMut;
 use mtorrent_core::{pe, pwp};
 use mtorrent_utils::info_stopwatch;
-use mtorrent_utils::ip::bind_to_interface;
+use mtorrent_utils::net::bind_to_interface;
 use mtorrent_utils::peer_id::PeerId;
 use std::io;
 use std::net::SocketAddr;
diff --git a/mtorrent/src/ops/peer/utp.rs b/mtorrent/src/ops/peer/utp.rs
@@ -2,7 +2,7 @@ use super::super::PeerReporter;
 use bytes::BytesMut;
 use futures_util::StreamExt;
 use mtorrent_core::{pe, pwp, utp};
-use mtorrent_utils::ip::bind_to_interface;
+use mtorrent_utils::net::bind_to_interface;
 use mtorrent_utils::peer_id::PeerId;
 use std::io;
 use std::net::SocketAddr;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`use bitvec::prelude::*;`
`2`	`2`	`use bytes::{Buf, BufMut};`
`3`	`3`	`use derive_more::Display;`
`4`		`-use mtorrent_utils::{benc, ip};`
	`4`	`+use mtorrent_utils::{benc, net};`
`5`	`5`	`use std::collections::{BTreeMap, HashMap, HashSet};`
`6`	`6`	`use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};`
`7`	`7`	`use std::{fmt, io};`
`@@ -684,16 +684,16 @@ impl PeerExchangeData {`
`684`	`684`	`let mut dropped = HashSet::new();`
`685`	`685`
`686`	`686`	`if let Some(ByteString(s)) = root.remove(Self::KEY_ADDED_V4) {`
`687`		`- added.extend(ip::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));`
	`687`	`+ added.extend(net::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));`
`688`	`688`	`}`
`689`	`689`	`if let Some(ByteString(s)) = root.remove(Self::KEY_ADDED_V6) {`
`690`		`- added.extend(ip::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));`
	`690`	`+ added.extend(net::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));`
`691`	`691`	`}`
`692`	`692`	`if let Some(ByteString(s)) = root.remove(Self::KEY_DROPPED_V4) {`
`693`		`- dropped.extend(ip::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));`
	`693`	`+ dropped.extend(net::SocketAddrV4BytesIter(&s).map(SocketAddr::V4));`
`694`	`694`	`}`
`695`	`695`	`if let Some(ByteString(s)) = root.remove(Self::KEY_DROPPED_V6) {`
`696`		`- dropped.extend(ip::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));`
	`696`	`+ dropped.extend(net::SocketAddrV6BytesIter(&s).map(SocketAddr::V6));`
`697`	`697`	`}`
`698`	`698`	`Some(PeerExchangeData { added, dropped })`
`699`	`699`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`use local_async_utils::prelude::*;`
`2`		`-use mtorrent_utils::{benc, ip};`
	`2`	`+use mtorrent_utils::{benc, net};`
`3`	`3`	`use reqwest::{ClientBuilder, Url};`
`4`	`4`	`use std::collections::{BTreeMap, HashMap};`
`5`	`5`	`use std::net::{IpAddr, SocketAddr};`
`@@ -355,15 +355,15 @@ impl AnnounceResponseContent {`
`355`	`355`	`let mut all_peers = Vec::new();`
`356`	`356`	`match peers {`
`357`	`357`	`Some(benc::Element::ByteString(data)) => {`
`358`		`- all_peers.extend(ip::SocketAddrV4BytesIter(data).map(SocketAddr::V4));`
	`358`	`+ all_peers.extend(net::SocketAddrV4BytesIter(data).map(SocketAddr::V4));`
`359`	`359`	`}`
`360`	`360`	`Some(benc::Element::List(list)) => {`
`361`	`361`	`all_peers.extend(dictionary_peers(list));`
`362`	`362`	`}`
`363`	`363`	`_ => (),`
`364`	`364`	`}`
`365`	`365`	`if let Some(benc::Element::ByteString(data)) = ipv6_peers {`
`366`		`- all_peers.extend(ip::SocketAddrV6BytesIter(data).map(SocketAddr::V6))`
	`366`	`+ all_peers.extend(net::SocketAddrV6BytesIter(data).map(SocketAddr::V6))`
`367`	`367`	`}`
`368`	`368`	`Some(all_peers)`
`369`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ fn get_adapter_addrs<'a>(`
`46`	`46`	`.flat_map(ipconfig::Adapter::ip_addresses)`
`47`	`47`	`}`
`48`	`48`
	`49`	`+/// Get the local IP address to bind to, based on the specified network interface (if any).`
`49`	`50`	`pub fn get_bind_addr_v4(interface: Option<&str>) -> Ipv4Addr {`
`50`	`51`	`let Some(iface) = interface else {`
`51`	`52`	`return Ipv4Addr::UNSPECIFIED;`
`@@ -74,6 +75,7 @@ pub fn get_bind_addr_v4(interface: Option<&str>) -> Ipv4Addr {`
`74`	`75`	`Ipv4Addr::UNSPECIFIED`
`75`	`76`	`}`
`76`	`77`
	`78`	`+/// Get the local IP address to bind to, based on the specified network interface (if any).`
`77`	`79`	`pub fn get_bind_addr_v6(interface: Option<&str>) -> Ipv6Addr {`
`78`	`80`	`let Some(iface) = interface else {`
`79`	`81`	`return Ipv6Addr::UNSPECIFIED;`
`@@ -121,6 +123,7 @@ pub fn set_so_rcvbuf_internal<'s>(socket: impl Into<SockRef<'s>>, value: usize,`
`121`	`123`	`}`
`122`	`124`	`}`
`123`	`125`
	`126`	`+/// Bind a socket to a specific network interface. Does nothing on Windows.`
`124`	`127`	`#[cfg(target_os = "windows")]`
`125`	`128`	`pub fn bind_to_interface<'s>(_socket: impl Into<SockRef<'s>>, _interface: &str) -> io::Result<()> {`
`126`	`129`	`// not supported on Windows`
`@@ -177,15 +180,15 @@ pub fn bind_to_interface<'s>(socket: impl Into<SockRef<'s>>, interface: &str) ->`
`177`	`180`	`#[macro_export]`
`178`	`181`	`macro_rules! set_so_sndbuf {`
`179`	`182`	`($sock:expr, $size:expr) => {{`
`180`		`- $crate::ip::set_so_sndbuf_internal($sock, $size, std::module_path!());`
	`183`	`+ $crate::net::set_so_sndbuf_internal($sock, $size, std::module_path!());`
`181`	`184`	`}};`
`182`	`185`	`}`
`183`	`186`
`184`	`187`	`/// Set SO_RCVBUF on a socket.`
`185`	`188`	`#[macro_export]`
`186`	`189`	`macro_rules! set_so_rcvbuf {`
`187`	`190`	`($sock:expr, $size:expr) => {{`
`188`		`- $crate::ip::set_so_rcvbuf_internal($sock, $size, std::module_path!());`
	`191`	`+ $crate::net::set_so_rcvbuf_internal($sock, $size, std::module_path!());`
`189`	`192`	`}};`
`190`	`193`	`}`
`191`	`194`