🎨 Sync upstream hickory-dns

Cargo.toml

@@ -2,8 +2,8 @@
 name = "smartdns"
 version = "0.9.2-alpha.1"
 authors = ["YISH <[email protected]>"]
-edition = "2021"
-rust-version = "1.75.0"
+edition = "2024"
+rust-version = "1.85.0"
 
 keywords = ["DNS", "BIND", "dig", "SmartDNS", "Dnsmasq"]
 categories = ["network-programming"]
@@ -45,27 +45,23 @@ self-update = ["dep:self_update"]
 
 resolve-cli = ["dep:console"]
 
-dns-over-tls = []
-dns-over-https = ["dns-over-https-rustls"]
+dns-over-tls = [
+  "hickory-proto/tls-ring",
+  "hickory-resolver/tls-ring",
+]
+dns-over-https = [
+  "hickory-proto/https-ring",
+  "hickory-resolver/https-ring"
+]
 dns-over-quic = [
-  "dns-over-rustls",
-  "hickory-proto/dns-over-quic",
-  "hickory-resolver/dns-over-quic",
+  "hickory-proto/quic-ring",
+  "hickory-resolver/quic-ring",
 ]
 dns-over-h3 = [
-  "dns-over-rustls",
-  "hickory-proto/dns-over-h3",
-  "hickory-resolver/dns-over-h3"
+  "hickory-proto/h3-ring",
+  "hickory-resolver/h3-ring"
 ]
 
-dns-over-https-rustls = [
-  "dns-over-rustls",
-  "hickory-proto/dns-over-https-rustls",
-  "hickory-resolver/dns-over-https-rustls",
-]
-
-dns-over-rustls = []
-
 mdns = []
 
 service = [
@@ -162,12 +158,11 @@ tracing-subscriber = { version = "0.3", features = [
 # tracing-appender = "0.2"
 
 # hickory dns
-hickory-proto = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "0.25.0-smartdns.6", version = "0.25.0-alpha.4", features = ["serde"]}
-hickory-resolver = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "0.25.0-smartdns.6", version = "0.25.0-alpha.4", features = [
+hickory-proto = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "0.25.0-smartdns.7", features = ["serde"]}
+hickory-resolver = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "0.25.0-smartdns.7", features = [
   "serde",
   "system-config",
 ] }
-# hickory-server = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "0.25.0-smartdns.5", version = "0.25.0-alpha.2", features = ["resolver"], optional = true }
 quinn = { version = "0.11.2", default-features = false }
 
 # ssl
@@ -244,7 +239,7 @@ anyhow = "1.0"
 
 [target.'cfg(target_os = "linux")'.build-dependencies]
 cc = "1.2"
-bindgen = "0.70"
+bindgen = "0.71"
 
 
 # Dev-dependencies are not used when compiling a package for building, but are used for compiling tests, examples, and benchmarks.

src/api/address.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use super::openapi::{http::get, routes, IntoRouter};
+use super::openapi::{IntoRouter, http::get, routes};
 use super::{IntoDataListPayload, ServeState, StatefulRouter};
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{Json, extract::State, response::IntoResponse};
 
 pub fn routes() -> StatefulRouter {
     routes![addresses].into_router()

src/api/audit.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use super::openapi::{http::get, routes, IntoRouter};
-use axum::{extract::State, response::IntoResponse, Json};
+use super::openapi::{IntoRouter, http::get, routes};
+use axum::{Json, extract::State, response::IntoResponse};
 
 use super::{ServeState, StatefulRouter};
 

src/api/cache.rs

@@ -1,12 +1,13 @@
 use std::sync::Arc;
 
 use super::openapi::{
+    IntoRouter,
     http::{get, post},
-    routes, IntoRouter,
+    routes,
 };
 use super::{IntoDataListPayload, ServeState, StatefulRouter};
 use crate::log;
-use axum::{extract::State, http::StatusCode, response::IntoResponse, Json};
+use axum::{Json, extract::State, http::StatusCode, response::IntoResponse};
 
 pub fn routes() -> StatefulRouter {
     let route1 = routes![flush_cache, caches].into_router();

src/api/forward.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{Json, extract::State, response::IntoResponse};
 
-use super::openapi::{http::get, routes, IntoRouter};
+use super::openapi::{IntoRouter, http::get, routes};
 use super::{IntoDataListPayload, ServeState, StatefulRouter};
 
 pub fn routes() -> StatefulRouter {

src/api/listener.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{Json, extract::State, response::IntoResponse};
 
-use super::openapi::{http::get, routes, IntoRouter};
+use super::openapi::{IntoRouter, http::get, routes};
 use super::{IntoDataListPayload, ServeState, StatefulRouter};
 
 pub fn routes() -> StatefulRouter {

src/api/log.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use super::openapi::{http::get, routes, IntoRouter};
+use super::openapi::{IntoRouter, http::get, routes};
 use super::{ServeState, StatefulRouter};
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{Json, extract::State, response::IntoResponse};
 
 pub fn routes() -> StatefulRouter {
     routes![log_config].into_router()

src/api/mod.rs

@@ -1,8 +1,8 @@
 use axum::{
+    Json,
     http::StatusCode,
     response::{IntoResponse, Response},
     routing::get,
-    Json,
 };
 use cfg_if::cfg_if;
 use openapi::Router;

src/api/nameserver.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{Json, extract::State, response::IntoResponse};
 
-use super::openapi::{http::get, routes, IntoRouter};
+use super::openapi::{IntoRouter, http::get, routes};
 use super::{IntoDataListPayload, ServeState, StatefulRouter};
 
 pub fn routes() -> StatefulRouter {

src/api/openapi.rs

@@ -2,8 +2,8 @@
 
 use axum::routing::MethodRouter;
 use utoipa::{
-    openapi::{Paths, RefOr, Schema},
     OpenApi,
+    openapi::{Paths, RefOr, Schema},
 };
 
 pub use utoipa::{IntoParams, ToSchema};
@@ -33,10 +33,10 @@ pub fn swagger_cdn<S: Clone + Send + Sync + 'static>(
     cdn: Option<&str>,
 ) -> axum::Router<S> {
     use axum::{
+        Router,
         extract::State,
         response::{Html, Json},
         routing::get,
-        Router,
     };
     use std::sync::Arc;
     use utoipa::openapi::OpenApi;

src/api/serve_dns.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use axum::body::Body;
 use axum::extract::Query;
-use axum::http::{header, HeaderValue, StatusCode};
+use axum::http::{HeaderValue, StatusCode, header};
 use axum::response::{IntoResponse, Response};
 use axum::{
     body::Bytes,
@@ -12,8 +12,9 @@ use axum::{
 use serde::{Deserialize, Serialize};
 
 use super::openapi::{
+    IntoParams, IntoRouter, ToSchema,
     http::{get, post},
-    routes, IntoParams, IntoRouter, ToSchema,
+    routes,
 };
 use super::{ServeState, StatefulRouter};
 use crate::{dns::SerialMessage, libdns::Protocol, log};

src/api/settings.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
-use super::openapi::{http::get, routes, IntoRouter};
+use super::openapi::{IntoRouter, http::get, routes};
 use super::{ServeState, StatefulRouter};
-use axum::{extract::State, response::IntoResponse, Json};
+use axum::{Json, extract::State, response::IntoResponse};
 
 pub fn routes() -> StatefulRouter {
     routes![server_name].into_router()

src/app.rs

@@ -337,8 +337,8 @@ async fn process(
     message: SerialMessage,
     server_opts: ServerOpts,
 ) -> SerialMessage {
-    use crate::libdns::proto::op::{Header, Message, MessageType, OpCode, ResponseCode};
     use crate::libdns::proto::ProtoError;
+    use crate::libdns::proto::op::{Header, Message, MessageType, OpCode, ResponseCode};
 
     let addr = message.addr();
     let protocol = message.protocol();
@@ -380,7 +380,15 @@ async fn process(
                                     }
                                     Err(e) => {
                                         if e.is_nx_domain() {
-                                            log::debug!("{}Response: error resolving: NXDomain, Duration: {:?}", if server_opts.is_background { "Background"} else { "" }, start.elapsed());
+                                            log::debug!(
+                                                "{}Response: error resolving: NXDomain, Duration: {:?}",
+                                                if server_opts.is_background {
+                                                    "Background"
+                                                } else {
+                                                    ""
+                                                },
+                                                start.elapsed()
+                                            );
                                             response_header
                                                 .set_response_code(ResponseCode::NXDomain);
                                         }
@@ -390,7 +398,11 @@ async fn process(
                                             None => {
                                                 log::debug!(
                                                     "{}Response: error resolving: {}, Duration: {:?}",
-                                                    if server_opts.is_background { "Background"} else { "" },
+                                                    if server_opts.is_background {
+                                                        "Background"
+                                                    } else {
+                                                        ""
+                                                    },
                                                     e,
                                                     start.elapsed()
                                                 );
@@ -432,7 +444,7 @@ async fn process(
                 proto = protocol,
                 addr = addr.ip(),
                 port = addr.port(),
-                message_type= request_header.message_type(),
+                message_type = request_header.message_type(),
                 op = request_header.op_code(),
                 error = error,
             );

src/collections.rs

@@ -159,7 +159,7 @@ impl FromIterator<WildcardName> for DomainSet {
 mod trie {
     use crate::third_ext::AsSlice;
     use std::{
-        collections::{hash_map::RandomState, HashMap},
+        collections::{HashMap, hash_map::RandomState},
         hash::{BuildHasher, Hash},
     };
 
@@ -555,7 +555,7 @@ mod benchmark {
         for name in domain_list.iter() {
             set.insert(name.clone());
         }
-        let set = phf::create_from_hashmap(set.0 .0);
+        let set = phf::create_from_hashmap(set.0.0);
         let set = &set;
 
         let domain_list = &domain_list;

src/config/mod.rs

@@ -9,8 +9,8 @@ use std::{
 use crate::{
     infra::file_mode::FileMode,
     libdns::proto::rr::{
-        rdata::{HTTPS, SRV},
         Name, RecordType,
+        rdata::{HTTPS, SRV},
     },
     log::Level,
     proxy::ProxyConfig,

src/config/parser/https_record.rs

@@ -30,7 +30,7 @@ impl NomParser for HttpsRecordRule {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::libdns::proto::rr::rdata::svcb::{Alpn, IpHint, SvcParamKey, SvcParamValue, SVCB};
+    use crate::libdns::proto::rr::rdata::svcb::{Alpn, IpHint, SVCB, SvcParamKey, SvcParamValue};
 
     #[test]
     fn test_parse() {

src/config/parser/mod.rs

@@ -1,6 +1,6 @@
 use nom::{
-    branch::*, bytes::complete::*, character::complete::*, combinator::*, multi::*, sequence::*,
-    IResult,
+    IResult, branch::*, bytes::complete::*, character::complete::*, combinator::*, multi::*,
+    sequence::*,
 };
 
 mod address_rule;

src/config/parser/nom_recipes/ip.rs

@@ -1,7 +1,7 @@
 use std::net::IpAddr;
 
 use super::{ipv4, ipv6};
-use nom::{branch::alt, combinator::map, IResult};
+use nom::{IResult, branch::alt, combinator::map};
 
 pub fn ip(input: &str) -> IResult<&str, IpAddr> {
     alt((map(ipv4, IpAddr::from), map(ipv6, IpAddr::from)))(input)

src/config/parser/nom_recipes/ipv4.rs

@@ -1,12 +1,12 @@
 use std::net::Ipv4Addr;
 
 use nom::{
+    IResult,
     character::complete::{char, digit1},
     combinator::{map, map_res, recognize},
     error::context,
     multi::many_m_n,
     sequence::{preceded, tuple},
-    IResult,
 };
 
 pub fn ipv4(input: &str) -> IResult<&str, Ipv4Addr> {

src/config/parser/nom_recipes/ipv6.rs

@@ -1,14 +1,14 @@
 use std::net::Ipv6Addr;
 
 use nom::{
+    IResult,
     branch::alt,
     bytes::complete::tag,
     character::complete::{char, hex_digit1},
     combinator::{map, map_res, opt, recognize, verify},
     error::context,
     multi::{many_m_n, separated_list0},
     sequence::{pair, preceded},
-    IResult,
 };
 
 use super::ipv4;

src/config/parser/svcb.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::libdns::proto::rr::rdata::svcb::{
-    Alpn, EchConfigList, IpHint, SvcParamKey, SvcParamValue, SVCB,
+    Alpn, EchConfigList, IpHint, SVCB, SvcParamKey, SvcParamValue,
 };
 use crate::libdns::proto::rr::rdata::{A, AAAA};