safe-async/hyperjive
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update to hickory dns

Browse source
This commit is contained in:
asonix 2023-10-23 17:03:29 -05:00
parent 377fc16a45
commit 66762599f9
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -19,7 +19,7 @@ required-features = ["client"]
[features]
default = ["client", "server"]
server = ["hyper/server"]
client = ["async-trait", "hyper/client", "jive-dns", "trust-dns-resolver"]
client = ["dep:async-trait", "hyper/client", "dep:jive-dns", "dep:hickory-resolver"]
[dependencies]
async-trait = { version = "0.1.52", optional = true }
@ -28,7 +28,7 @@ jive = { git = "https://git.asonix.dog/safe-async/jive", features = [
"tokio-io-compat",
] }
tokio = { version = "1", default-features = false }
trust-dns-resolver = { version = "0.23.0", default-features = false, optional = true }
hickory-resolver = { version = "0.24.0", default-features = false, optional = true }
jive-dns = { git = "https://git.asonix.dog/safe-async/jive-dns", optional = true }
[dev-dependencies]

24
src/lib.rs
View file

@ -118,7 +118,7 @@ pub mod client {
#[derive(Debug)]
pub enum ResolveError {
Dns(trust_dns_resolver::error::ResolveError),
Dns(hickory_resolver::error::ResolveError),
Invalid,
}
@ -138,8 +138,8 @@ pub mod client {
fut: BoxFuture<
'static,
Result<
trust_dns_resolver::lookup_ip::LookupIp,
trust_dns_resolver::error::ResolveError,
hickory_resolver::lookup_ip::LookupIp,
hickory_resolver::error::ResolveError,
>,
>,
},
@ -155,7 +155,7 @@ pub mod client {
pub fn new() -> Result<
hyper::Client<ConnectService<ResolverService>>,
trust_dns_resolver::error::ResolveError,
hickory_resolver::error::ResolveError,
> {
Ok(builder().build(connect_service()?))
}
@ -167,7 +167,7 @@ pub mod client {
}
pub fn connect_service(
) -> Result<ConnectService<ResolverService>, trust_dns_resolver::error::ResolveError> {
) -> Result<ConnectService<ResolverService>, hickory_resolver::error::ResolveError> {
ConnectService::new()
}
@ -182,7 +182,7 @@ pub mod client {
}
impl ConnectService<ResolverService> {
pub fn new() -> Result<Self, trust_dns_resolver::error::ResolveError> {
pub fn new() -> Result<Self, hickory_resolver::error::ResolveError> {
Ok(Self::new_with_resolver(ResolverService::from_system_conf()?))
}
}
@ -228,16 +228,16 @@ pub mod client {
}
impl ResolverService {
pub fn from_system_conf() -> Result<Self, trust_dns_resolver::error::ResolveError> {
pub fn from_system_conf() -> Result<Self, hickory_resolver::error::ResolveError> {
Ok(ResolverService {
resolver: jive_dns::resolver_from_system_conf()?,
})
}
pub fn new(
config: trust_dns_resolver::config::ResolverConfig,
options: trust_dns_resolver::config::ResolverOpts,
) -> Result<Self, trust_dns_resolver::error::ResolveError> {
config: hickory_resolver::config::ResolverConfig,
options: hickory_resolver::config::ResolverOpts,
) -> Result<Self, hickory_resolver::error::ResolveError> {
Ok(ResolverService {
resolver: jive_dns::resolver(config, options),
})
@ -297,8 +297,8 @@ pub mod client {
}
}
impl From<trust_dns_resolver::error::ResolveError> for ResolveError {
fn from(e: trust_dns_resolver::error::ResolveError) -> Self {
impl From<hickory_resolver::error::ResolveError> for ResolveError {
fn from(e: hickory_resolver::error::ResolveError) -> Self {
ResolveError::Dns(e)
}
}