Switch back to DoH

Remove test workaround now that IPv6 is preferred in trust-dns hostname resolution

Author: daxpedda

Cargo.toml

@@ -35,7 +35,7 @@ serde = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["rt-multi-thread"] }
 trust-dns-resolver = { version = "0.20", default-features = false, features = [
-	"dns-over-rustls",
+	"dns-over-https-rustls",
 	"dnssec-ring",
 	"tokio-runtime",
 ], optional = true }

clippy.toml

@@ -0,0 +1 @@
+doc-valid-idents = ["DoH", "IPv4", "IPv6"]

src/quic/endpoint/builder/mod.rs

@@ -67,9 +67,8 @@ impl Builder {
 			#[cfg(not(feature = "test"))]
 			address: ([0; 8], 0).into(),
 			// while testing always use the default loopback address
-			// equals to `[::ffff:127.0.0.1]:0`
 			#[cfg(feature = "test")]
-			address: ([0, 0, 0, 0, 0, 0xffff, 0x7f00, 1], 0).into(),
+			address: ([0, 0, 0, 0, 0, 0, 0, 1], 0).into(),
 			root_certificates: Vec::new(),
 			server_key_pair: None,
 			client_key_pair: None,
@@ -489,7 +488,7 @@ mod test {
 	async fn address() -> Result<()> {
 		let mut builder = Builder::new();
 
-		let address = ([0, 0, 0, 0, 0, 0xffff, 0x7f00, 1], 5000).into();
+		let address = ([0, 0, 0, 0, 0, 0, 0, 1], 5000).into();
 		let _ = builder.set_address(address);
 		assert_eq!(builder.address(), &address);
 

src/quic/endpoint/mod.rs

@@ -149,7 +149,7 @@ impl Endpoint {
 		let _ = builder.set_address(([0; 8], port).into());
 		// while testing always use the default loopback address
 		#[cfg(feature = "test")]
-		let _ = builder.set_address(([0, 0, 0, 0, 0, 0xffff, 0x7f00, 1], port).into());
+		let _ = builder.set_address(([0, 0, 0, 0, 0, 0, 0, 1], port).into());
 		let _ = builder.set_server_key_pair(Some(key_pair));
 
 		builder
@@ -191,8 +191,7 @@ impl Endpoint {
 	/// The following settings are used when using
 	/// [`trust-dns`](trust_dns_resolver):
 	/// - all system configurations are ignored
-	#[allow(clippy::doc_markdown)]
-	/// - Cloudflare with DoT is used as the name server
+	/// - Cloudflare with DoH is used as the name server
 	/// - DNSSEC is enabled
 	/// - IPv6 is preferred over IPv4 if the bound socket is IPv6
 	///
@@ -324,7 +323,7 @@ impl Endpoint {
 
 			// build the `Resolver`
 			#[allow(box_pointers)]
-			let resolver = TokioAsyncResolver::tokio(ResolverConfig::cloudflare_tls(), opts)
+			let resolver = TokioAsyncResolver::tokio(ResolverConfig::cloudflare_https(), opts)
 				.map_err(|error| Error::ResolveTrustDns(Box::new(error)))?;
 			// query the IP
 			#[allow(box_pointers)]
@@ -362,17 +361,7 @@ impl Endpoint {
 	/// # Errors
 	/// [`Error::LocalAddress`] if aquiring the local address failed.
 	pub fn local_address(&self) -> Result<SocketAddr> {
-		let address = self.endpoint.local_addr().map_err(Error::LocalAddress)?;
-
-		#[cfg(not(feature = "test"))]
-		return Ok(address);
-
-		#[cfg(feature = "test")]
-		Ok(if address.ip().is_loopback() {
-			([0, 0, 0, 0, 0, 0xffff, 0x7f00, 1], address.port()).into()
-		} else {
-			address
-		})
+		self.endpoint.local_addr().map_err(Error::LocalAddress)
 	}
 
 	/// Close all of this [`Endpoint`]'s [`Connection`](crate::Connection)s