refactor(iroh)!: rework net_report (#3314)

## Description 

- Use more `Watchable` in  more places
- Drops STUN, ICMP and hairpin probes, they are not actually needed in
our world
- restructure report generation
- Keep QAD connections open, instead of recreating them on every report
- Removes `STUN` functionality from the relay server

**Fixes**

- #3315


## Breaking Changes

- removes `iroh_relay::protos::stun::StunError`
- removes `iroh_relay::server::testing::stun_config`
- removes `iroh_relay::protos::stun`
- removes `iroh_relay::quic::QuicClient::get_addr_and_latency`
- removes `DEFAULT_STUN_PORT`
 


## Depends on 

- [x] #3279 
- [x] n0-computer/net-tools#27

---------

Co-authored-by: Kasey <kasey@n0.computer>

Author: dignifiedquire

Cargo.lock

@@ -2,7 +2,7 @@ FROM rust:alpine AS chef
 
 RUN update-ca-certificates
 RUN apk add --no-cache musl-dev openssl-dev pkgconfig
-RUN cargo install cargo-chef 
+RUN cargo install cargo-chef
 WORKDIR /iroh
 
 FROM chef AS planner
@@ -40,7 +40,7 @@ RUN chmod +x /iroh-relay
 WORKDIR /
 
 # expose the default ports
-# http, https, stun, metrics
+# http, https, metrics
 EXPOSE  80 443 3478/udp 9090
 ENTRYPOINT ["/iroh-relay"]
 CMD [""]
@@ -62,4 +62,4 @@ WORKDIR /
 # dns, metrics
 EXPOSE 53/udp 9090
 ENTRYPOINT ["/iroh-dns-server"]
-CMD [""]
+CMD [""]

docker/Dockerfile

@@ -1,5 +1,2 @@
 [[relay_nodes]]
 url = "https://foo.bar"
-stun_only = false
-stun_port = 1244
-

example.config.toml

@@ -51,7 +51,6 @@ reqwest = { version = "0.12", default-features = false, features = [
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
 serde = { version = "1", features = ["derive", "rc"] }
 strum = { version = "0.26", features = ["derive"] }
-stun-rs = "0.1.11"
 tokio = { version = "1", features = [
     "io-util",
     "macros",

iroh-relay/Cargo.toml

@@ -15,10 +15,10 @@ relays, including:
 - Relay Protocol: The protocol used to communicate between relay servers and
   clients
 - Relay Server: A fully-fledged iroh-relay server over HTTP or HTTPS.
-  Optionally will also expose a stun endpoint and metrics.
+  Optionally will also expose a QAD endpoint and metrics.
 - Relay Client: A client for establishing connections to the relay.
 - Server Binary: A CLI for running your own relay server. It can be configured
-  to also offer STUN support and expose metrics.
+  to also expose metrics.
 
 
 Used in [iroh], created with love by the [n0 team](https://n0.computer/).

iroh-relay/README.md

@@ -1,10 +1,5 @@
 //! Default values used in the relay.
 
-/// The default STUN port used by the Relay server.
-///
-/// The STUN port as defined by [RFC 8489](<https://www.rfc-editor.org/rfc/rfc8489#section-18.6>)
-pub const DEFAULT_STUN_PORT: u16 = 3478;
-
 /// The default QUIC port used by the Relay server to accept QUIC connections
 /// for QUIC address discovery
 ///

iroh-relay/src/defaults.rs

@@ -4,6 +4,7 @@ use std::{
     fmt,
     future::Future,
     net::{IpAddr, Ipv6Addr, SocketAddr},
+    sync::Arc,
 };
 
 use hickory_resolver::{name_server::TokioConnectionProvider, TokioResolver};
@@ -14,6 +15,7 @@ use n0_future::{
 };
 use nested_enum_utils::common_fields;
 use snafu::{Backtrace, GenerateImplicitData, OptionExt, Snafu};
+use tokio::sync::RwLock;
 use url::Url;
 
 use crate::node_info::{LookupError, NodeInfo};
@@ -77,7 +79,10 @@ impl<E: std::fmt::Debug + std::fmt::Display> StaggeredError<E> {
 
 /// The DNS resolver used throughout `iroh`.
 #[derive(Debug, Clone)]
-pub struct DnsResolver(TokioResolver);
+pub struct DnsResolver {
+    resolver: Arc<RwLock<TokioResolver>>,
+    nameserver: Option<SocketAddr>,
+}
 
 impl DnsResolver {
     /// Create a new DNS resolver with sensible cross-platform defaults.
@@ -86,6 +91,14 @@ impl DnsResolver {
     /// This does not work at least on some Androids, therefore we fallback
     /// to the default `ResolverConfig` which uses eg. to google's `8.8.8.8` or `8.8.4.4`.
     pub fn new() -> Self {
+        let resolver = Self::new_inner();
+        Self {
+            resolver: Arc::new(RwLock::new(resolver)),
+            nameserver: None,
+        }
+    }
+
+    fn new_inner() -> TokioResolver {
         let (system_config, mut options) =
             hickory_resolver::system_conf::read_system_conf().unwrap_or_default();
 
@@ -110,11 +123,19 @@ impl DnsResolver {
         let mut builder =
             TokioResolver::builder_with_config(config, TokioConnectionProvider::default());
         *builder.options_mut() = options;
-        DnsResolver(builder.build())
+        builder.build()
     }
 
     /// Create a new DNS resolver configured with a single UDP DNS nameserver.
     pub fn with_nameserver(nameserver: SocketAddr) -> Self {
+        let resolver = Self::with_nameserver_inner(nameserver);
+        Self {
+            resolver: Arc::new(RwLock::new(resolver)),
+            nameserver: Some(nameserver),
+        }
+    }
+
+    fn with_nameserver_inner(nameserver: SocketAddr) -> TokioResolver {
         let mut config = hickory_resolver::config::ResolverConfig::new();
         let nameserver_config = hickory_resolver::config::NameServerConfig::new(
             nameserver,
@@ -124,12 +145,24 @@ impl DnsResolver {
 
         let builder =
             TokioResolver::builder_with_config(config, TokioConnectionProvider::default());
-        DnsResolver(builder.build())
+        builder.build()
     }
 
     /// Removes all entries from the cache.
-    pub fn clear_cache(&self) {
-        self.0.clear_cache();
+    pub async fn clear_cache(&self) {
+        self.resolver.read().await.clear_cache();
+    }
+
+    /// Recreate the inner resolver
+    pub async fn reset(&self) {
+        let mut this = self.resolver.write().await;
+        let resolver = if let Some(nameserver) = self.nameserver {
+            Self::with_nameserver_inner(nameserver)
+        } else {
+            Self::new_inner()
+        };
+
+        *this = resolver;
     }
 
     /// Lookup a TXT record.
@@ -139,7 +172,8 @@ impl DnsResolver {
         timeout: Duration,
     ) -> Result<TxtLookup, DnsError> {
         let host = host.to_string();
-        let res = time::timeout(timeout, self.0.txt_lookup(host)).await??;
+        let this = self.resolver.read().await;
+        let res = time::timeout(timeout, this.txt_lookup(host)).await??;
         Ok(TxtLookup(res))
     }
 
@@ -150,7 +184,8 @@ impl DnsResolver {
         timeout: Duration,
     ) -> Result<impl Iterator<Item = IpAddr>, DnsError> {
         let host = host.to_string();
-        let addrs = time::timeout(timeout, self.0.ipv4_lookup(host)).await??;
+        let this = self.resolver.read().await;
+        let addrs = time::timeout(timeout, this.ipv4_lookup(host)).await??;
         Ok(addrs.into_iter().map(|ip| IpAddr::V4(ip.0)))
     }
 
@@ -161,7 +196,8 @@ impl DnsResolver {
         timeout: Duration,
     ) -> Result<impl Iterator<Item = IpAddr>, DnsError> {
         let host = host.to_string();
-        let addrs = time::timeout(timeout, self.0.ipv6_lookup(host)).await??;
+        let this = self.resolver.read().await;
+        let addrs = time::timeout(timeout, this.ipv6_lookup(host)).await??;
         Ok(addrs.into_iter().map(|ip| IpAddr::V6(ip.0)))
     }
 
@@ -349,7 +385,10 @@ impl Default for DnsResolver {
 
 impl From<TokioResolver> for DnsResolver {
     fn from(resolver: TokioResolver) -> Self {
-        DnsResolver(resolver)
+        DnsResolver {
+            resolver: Arc::new(RwLock::new(resolver)),
+            nameserver: None,
+        }
     }
 }
 

iroh-relay/src/dns.rs

@@ -20,10 +20,10 @@
     doc = "- `server`: A fully-fledged iroh-relay server over HTTP or HTTPS."
 )]
 //!
-//!    Optionally will also expose a stun endpoint and metrics. (requires the feature flag `server`)
+//!    Optionally will also expose a QAD endpoint and metrics. (requires the feature flag `server`)
 //! - [`client`]: A client for establishing connections to the relay.
 //! - *Server Binary*: A CLI for running your own relay server. It can be configured to also offer
-//!   STUN support and expose metrics.
+//!   QAD support and expose metrics.
 // Based on tailscale/derp/derp.go
 
 #![cfg_attr(iroh_docsrs, feature(doc_auto_cfg))]