mirror of
https://gitlab.com/veilid/veilid.git
synced 2024-10-01 01:26:08 -04:00
chore: rebrand trust-dns-resolver to hickory-resolver
This commit is contained in:
parent
16dead2d6f
commit
aa43f8d4a6
50
Cargo.lock
generated
50
Cargo.lock
generated
@ -2316,6 +2316,51 @@ version = "0.4.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hickory-proto"
|
||||||
|
version = "0.24.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf"
|
||||||
|
dependencies = [
|
||||||
|
"async-trait",
|
||||||
|
"cfg-if 1.0.0",
|
||||||
|
"data-encoding",
|
||||||
|
"enum-as-inner",
|
||||||
|
"futures-channel",
|
||||||
|
"futures-io",
|
||||||
|
"futures-util",
|
||||||
|
"idna 0.4.0",
|
||||||
|
"ipnet",
|
||||||
|
"once_cell",
|
||||||
|
"rand",
|
||||||
|
"thiserror",
|
||||||
|
"tinyvec",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hickory-resolver"
|
||||||
|
version = "0.24.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 1.0.0",
|
||||||
|
"futures-util",
|
||||||
|
"hickory-proto",
|
||||||
|
"ipconfig",
|
||||||
|
"lru-cache",
|
||||||
|
"once_cell",
|
||||||
|
"parking_lot 0.12.1",
|
||||||
|
"rand",
|
||||||
|
"resolv-conf",
|
||||||
|
"smallvec",
|
||||||
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hkdf"
|
name = "hkdf"
|
||||||
version = "0.11.0"
|
version = "0.11.0"
|
||||||
@ -5282,7 +5327,6 @@ dependencies = [
|
|||||||
"smallvec",
|
"smallvec",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tinyvec",
|
"tinyvec",
|
||||||
"tokio",
|
|
||||||
"tracing",
|
"tracing",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
@ -5303,7 +5347,6 @@ dependencies = [
|
|||||||
"resolv-conf",
|
"resolv-conf",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
|
||||||
"tracing",
|
"tracing",
|
||||||
"trust-dns-proto",
|
"trust-dns-proto",
|
||||||
]
|
]
|
||||||
@ -5581,7 +5624,6 @@ dependencies = [
|
|||||||
"data-encoding",
|
"data-encoding",
|
||||||
"directories",
|
"directories",
|
||||||
"ed25519-dalek",
|
"ed25519-dalek",
|
||||||
"enum-as-inner",
|
|
||||||
"enumset",
|
"enumset",
|
||||||
"eyre",
|
"eyre",
|
||||||
"filetime",
|
"filetime",
|
||||||
@ -5590,6 +5632,7 @@ dependencies = [
|
|||||||
"getrandom",
|
"getrandom",
|
||||||
"glob",
|
"glob",
|
||||||
"hex",
|
"hex",
|
||||||
|
"hickory-resolver",
|
||||||
"jni",
|
"jni",
|
||||||
"jni-sys",
|
"jni-sys",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
@ -5636,7 +5679,6 @@ dependencies = [
|
|||||||
"tracing-oslog",
|
"tracing-oslog",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"tracing-wasm",
|
"tracing-wasm",
|
||||||
"trust-dns-resolver",
|
|
||||||
"tsify",
|
"tsify",
|
||||||
"veilid-async-tls",
|
"veilid-async-tls",
|
||||||
"veilid-async-tungstenite",
|
"veilid-async-tungstenite",
|
||||||
|
@ -25,7 +25,7 @@ default-wasm = ["enable-crypto-vld0"]
|
|||||||
rt-async-std = [
|
rt-async-std = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"async-std-resolver",
|
"async-std-resolver",
|
||||||
"trust-dns-resolver",
|
"hickory-resolver",
|
||||||
"async_executors/async_std",
|
"async_executors/async_std",
|
||||||
"veilid-tools/rt-async-std",
|
"veilid-tools/rt-async-std",
|
||||||
]
|
]
|
||||||
@ -33,7 +33,7 @@ rt-tokio = [
|
|||||||
"tokio",
|
"tokio",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"tokio-stream",
|
"tokio-stream",
|
||||||
"trust-dns-resolver/tokio-runtime",
|
"hickory-resolver/tokio-runtime",
|
||||||
"async_executors/tokio_tp",
|
"async_executors/tokio_tp",
|
||||||
"async_executors/tokio_io",
|
"async_executors/tokio_io",
|
||||||
"async_executors/tokio_timer",
|
"async_executors/tokio_timer",
|
||||||
@ -123,8 +123,7 @@ argon2 = "0.5.2"
|
|||||||
|
|
||||||
# Network
|
# Network
|
||||||
async-std-resolver = { version = "0.23.2", optional = true }
|
async-std-resolver = { version = "0.23.2", optional = true }
|
||||||
trust-dns-resolver = { version = "0.23.2", optional = true }
|
hickory-resolver = { version = "0.24.0", optional = true }
|
||||||
enum-as-inner = "=0.6.0" # temporary fix for trust-dns-resolver v0.22.0
|
|
||||||
|
|
||||||
# Serialization
|
# Serialization
|
||||||
capnp = { version = "0.18.10", default-features = false, features = ["alloc"] }
|
capnp = { version = "0.18.10", default-features = false, features = ["alloc"] }
|
||||||
|
@ -9,8 +9,8 @@ pub async fn get_outbound_relay_peer() -> Option<crate::routing_table::PeerInfo>
|
|||||||
/////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
// Resolver
|
// Resolver
|
||||||
//
|
//
|
||||||
// Uses system resolver on windows and trust-dns-resolver elsewhere
|
// Uses system resolver on windows and hickory-resolver elsewhere
|
||||||
// trust-dns-resolver hangs for a long time on Windows building some cache or something
|
// hickory-resolver hangs for a long time on Windows building some cache or something
|
||||||
// and we really should be using the built-in system resolver when possible
|
// and we really should be using the built-in system resolver when possible
|
||||||
|
|
||||||
cfg_if! {
|
cfg_if! {
|
||||||
@ -18,9 +18,9 @@ cfg_if! {
|
|||||||
cfg_if! {
|
cfg_if! {
|
||||||
if #[cfg(feature="rt-async-std")] {
|
if #[cfg(feature="rt-async-std")] {
|
||||||
use async_std_resolver::{config, resolver, resolver_from_system_conf, AsyncStdResolver as AsyncResolver};
|
use async_std_resolver::{config, resolver, resolver_from_system_conf, AsyncStdResolver as AsyncResolver};
|
||||||
use trust_dns_resolver::error::ResolveErrorKind;
|
use hickory_resolver::error::ResolveErrorKind;
|
||||||
} else if #[cfg(feature="rt-tokio")] {
|
} else if #[cfg(feature="rt-tokio")] {
|
||||||
use trust_dns_resolver::{config, TokioAsyncResolver as AsyncResolver, error::ResolveError, error::ResolveErrorKind};
|
use hickory_resolver::{config, TokioAsyncResolver as AsyncResolver, error::ResolveError, error::ResolveErrorKind};
|
||||||
|
|
||||||
pub async fn resolver(
|
pub async fn resolver(
|
||||||
config: config::ResolverConfig,
|
config: config::ResolverConfig,
|
||||||
|
Loading…
Reference in New Issue
Block a user