update to hickory 0.26

Cargo.toml

@@ -173,8 +173,8 @@ kanal = { version = "0.1.1", default-features = false }
 c-ares = { version = "12.0", default-features = false }
 c-ares-resolver = { version = "11.0", default-features = false }
 c-ares-sys = { version = "11.0", default-features = false }
-hickory-proto = { version = "0.25", default-features = false }
-hickory-client = { version = "0.25", default-features = false }
+hickory-proto = { version = "0.26.0", default-features = false }
+hickory-net = { version = "0.26.0", default-features = false }
 #
 capnp-rpc = "0.25"
 capnp = "0.25"

lib/vey-hickory-client/Cargo.toml

@@ -8,7 +8,9 @@ rust-version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-hickory-proto = { workspace = true, features = ["tokio"] }
+anyhow.workspace = true
+hickory-proto.workspace = true
+hickory-net = { workspace = true, features = ["tokio"] }
 futures-util.workspace = true
 http.workspace = true
 h2.workspace = true

lib/vey-hickory-client/src/connect/quinn.rs

@@ -1,23 +1,24 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  * Copyright 2024-2025 ByteDance and/or its affiliates.
+ * Copyright 2026 VEY-OSS developers.
  */
 
 use std::sync::Arc;
 
-use hickory_proto::ProtoError;
+use hickory_net::NetError;
 use quinn::crypto::rustls::QuicClientConfig;
 use quinn::{Connection, Endpoint, EndpointConfig, TokioRuntime};
 use rustls::ClientConfig;
 
 use vey_socket::UdpConnectInfo;
 
 pub(crate) async fn quic_connect(
-    connect_info: UdpConnectInfo,
+    connect_info: &UdpConnectInfo,
     mut tls_config: ClientConfig,
     tls_name: &str,
     alpn_protocol: &'static [u8],
-) -> Result<Connection, ProtoError> {
+) -> Result<Connection, NetError> {
     let sock = connect_info.udp_connect()?;
 
     let endpoint_config = EndpointConfig::default(); // TODO set max payload size

lib/vey-hickory-client/src/connect/rustls.rs

@@ -1,11 +1,12 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  * Copyright 2024-2025 ByteDance and/or its affiliates.
+ * Copyright 2026 VEY-OSS developers.
  */
 
 use std::sync::Arc;
 
-use hickory_proto::ProtoError;
+use anyhow::anyhow;
 use rustls::ClientConfig;
 use rustls_pki_types::ServerName;
 use tokio::net::TcpStream;
@@ -19,15 +20,21 @@ pub(crate) async fn tls_connect(
     mut tls_config: ClientConfig,
     tls_name: ServerName<'static>,
     alpn_protocol: &'static [u8],
-) -> Result<TlsStream<TcpStream>, ProtoError> {
-    let tcp_stream = connect_info.tcp_connect().await?;
+) -> anyhow::Result<TlsStream<TcpStream>> {
+    let tcp_stream = connect_info
+        .tcp_connect()
+        .await
+        .map_err(|e| anyhow!("tcp connect to {} failed: {e}", connect_info.server))?;
 
     if tls_config.alpn_protocols.is_empty() {
         tls_config.alpn_protocols = vec![alpn_protocol.to_vec()];
     }
 
     let tls_connector = TlsConnector::from(Arc::new(tls_config));
-    let tls_stream = tls_connector.connect(tls_name, tcp_stream).await?;
+    let tls_stream = tls_connector
+        .connect(tls_name, tcp_stream)
+        .await
+        .map_err(|e| anyhow!("tls handshake with {} failed: {e}", connect_info.server))?;
 
     Ok(tls_stream)
 }