chore(iroh): Update from alpha to release 0.25 hickory (#3256)

## Description

Updates hickory from 0.25-alpha.5 to hickory 0.25.1.

## Notes & open questions

Depends on rkuhn/swarm-discovery#15

## Change checklist
<!-- Remove any that are not relevant. -->
- [x] Self-review.
- [x] Checked `sendme`, `dumbpipe`, `iroh-gossip`, `iroh-blobs` and
`iroh-docs` for `hickory` dependencies. None of them have it.

Author: matheus23

Cargo.lock

@@ -25,7 +25,7 @@ derive_more = { version = "1.0.0", features = [
 ] }
 dirs-next = "2.0.0"
 governor = "0.6.3" #needs new release of tower_governor for 0.7.0
-hickory-server = { version = "=0.25.0-alpha.5", features = ["dns-over-rustls", "dns-over-https-rustls"] }
+hickory-server = { version = "0.25.1", features = ["https-ring"] }
 http = "1.0.0"
 humantime-serde = "1.1.1"
 iroh-metrics = { version = "0.32.0", features = ["metrics", "service"] }
@@ -59,7 +59,7 @@ z32 = "1.1.1"
 
 [dev-dependencies]
 criterion = "0.5.1"
-hickory-resolver = "=0.25.0-alpha.5"
+hickory-resolver = "0.25.0"
 iroh = { path = "../iroh" }
 pkarr = { version = "2.3.1", features = ["rand"] }
 rand = "0.8"

iroh-dns-server/Cargo.toml

@@ -111,7 +111,7 @@ pub fn signed_packet_to_hickory_records_without_origin(
         if name.num_labels() < 1 {
             continue;
         }
-        let zone = name.iter().last().unwrap().into_label()?;
+        let zone = name.iter().next_back().unwrap().into_label()?;
         if zone != common_zone {
             continue;
         }

iroh-dns-server/src/util.rs

@@ -40,7 +40,7 @@ url = { version = "2.4" }
 
 # non-wasm-in-browser dependencies
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
-hickory-resolver = "=0.25.0-alpha.5"
+hickory-resolver = "0.25.1"
 netwatch = { version = "0.4" }
 portmapper = { version = "0.4", default-features = false }
 surge-ping = "0.8.0"

iroh-net-report/Cargo.toml

@@ -78,7 +78,7 @@ z32 = "1.0.3"
 clap = { version = "4", features = ["derive"], optional = true }
 dashmap = { version = "6.1.0", optional = true }
 governor = { version = "0.7.0", optional = true }
-hickory-proto = { version = "=0.25.0-alpha.5", default-features = false, optional = true }
+hickory-proto = { version = "0.25.1", default-features = false, optional = true }
 rcgen = { version = "0.13", optional = true }
 regex = { version = "1.7.1", optional = true }
 reloadable-state = { version = "0.1", optional = true }
@@ -95,7 +95,7 @@ tracing-subscriber = { version = "0.3", features = [
 
 # non-wasm-in-browser dependencies
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
-hickory-resolver = "=0.25.0-alpha.5"
+hickory-resolver = { version = "0.25.1", features = ["tokio"] }
 tokio = { version = "1", features = [
     "io-util",
     "macros",

iroh-relay/Cargo.toml

@@ -7,7 +7,7 @@ use std::{
 };
 
 use anyhow::{bail, Context, Result};
-use hickory_resolver::{Resolver, TokioResolver};
+use hickory_resolver::{name_server::TokioConnectionProvider, TokioResolver};
 use iroh_base::NodeId;
 use n0_future::{
     time::{self, Duration},
@@ -54,8 +54,10 @@ impl DnsResolver {
         // see [`DnsResolver::lookup_ipv4_ipv6`] for info on why we avoid `LookupIpStrategy::Ipv4AndIpv6`
         options.ip_strategy = hickory_resolver::config::LookupIpStrategy::Ipv4thenIpv6;
 
-        let resolver = Resolver::tokio(config, options);
-        DnsResolver(resolver)
+        let mut builder =
+            TokioResolver::builder_with_config(config, TokioConnectionProvider::default());
+        *builder.options_mut() = options;
+        DnsResolver(builder.build())
     }
 
     /// Create a new DNS resolver configured with a single UDP DNS nameserver.
@@ -66,7 +68,10 @@ impl DnsResolver {
             hickory_resolver::proto::xfer::Protocol::Udp,
         );
         config.add_name_server(nameserver_config);
-        DnsResolver(Resolver::tokio(config, Default::default()))
+
+        let builder =
+            TokioResolver::builder_with_config(config, TokioConnectionProvider::default());
+        DnsResolver(builder.build())
     }
 
     /// Removes all entries from the cache.

iroh-relay/src/dns.rs

@@ -322,7 +322,7 @@ impl Server {
             relay.tls.as_ref().and_then(|tls| match tls.cert {
                 CertConfig::LetsEncrypt { .. } => None,
                 CertConfig::Manual { ref certs, .. } => Some(certs.clone()),
-                CertConfig::Reloading { .. } => None,
+                CertConfig::Reloading => None,
             })
         });
 
@@ -384,7 +384,7 @@ impl Server {
                                     acceptor,
                                 })
                             }
-                            CertConfig::Manual { .. } | CertConfig::Reloading { .. } => {
+                            CertConfig::Manual { .. } | CertConfig::Reloading => {
                                 let server_config = Arc::new(tls_config.server_config);
                                 let acceptor =
                                     tokio_rustls::TlsAcceptor::from(server_config.clone());

iroh-relay/src/server.rs

@@ -84,7 +84,7 @@ net-report = { package = "iroh-net-report", path = "../iroh-net-report", version
 iroh-metrics = { version = "0.32", default-features = false }
 
 # local-swarm-discovery
-swarm-discovery = { version = "0.3.0-alpha.2", optional = true }
+swarm-discovery = { version = "0.3.1", optional = true }
 futures-util = "0.3"
 
 # test_utils
@@ -100,7 +100,7 @@ parse-size = { version = "=1.0.0", optional = true } # pinned version to avoid b
 
 # non-wasm-in-browser dependencies
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
-hickory-resolver = { version = "=0.25.0-alpha.5" }
+hickory-resolver = "0.25.1"
 igd-next = { version = "0.15.1", features = ["aio_tokio"] }
 netdev = { version = "0.31.0" }
 portmapper = { version = "0.4", default-features = false }