berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

add changelog. fix Resolve trait

This commit is contained in:
fakeshadow 2021-01-19 01:55:30 +08:00
parent aea6051f4b
commit 33c827921f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actix-tls/CHANGES.md
View File

@ -1,6 +1,12 @@
# Changes # Changes
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
* Remove `trust-dns-proto` and `trust-dns-resolver` [#248]
* Use `tokio::net::lookup_host` for as simple and basic default resolver [#248]
* Add `Resolve` trait for custom dns resolver. Add `Resolver::new_custom` function
to construct custom resolvers.[#248]
[#248]: https://github.com/actix/actix-net/pull/248
## 3.0.0-beta.2 - 2021-xx-xx ## 3.0.0-beta.2 - 2021-xx-xx

12
actix-tls/src/connect/resolve.rs
View File

@ -1,8 +1,4 @@
use std::{ use std::{net::SocketAddr, rc::Rc, task::Poll};
net::{SocketAddr, ToSocketAddrs},
rc::Rc,
task::Poll,
};
use actix_service::{Service, ServiceFactory}; use actix_service::{Service, ServiceFactory};
use futures_core::future::LocalBoxFuture; use futures_core::future::LocalBoxFuture;
@ -52,7 +48,7 @@ pub enum Resolver {
pub trait Resolve { pub trait Resolve {
fn lookup( fn lookup(
&self, &self,
addrs: Vec<SocketAddr>, addrs: String,
) -> LocalBoxFuture<'_, Result<Vec<SocketAddr>, Box<dyn std::error::Error>>>; ) -> LocalBoxFuture<'_, Result<Vec<SocketAddr>, Box<dyn std::error::Error>>>;
} }
@ -81,10 +77,6 @@ impl Resolver {
Ok(res.collect()) Ok(res.collect())
} }
Self::Custom(resolver) => { Self::Custom(resolver) => {
let host = host
.to_socket_addrs()
.map_err(|e| ConnectError::Resolver(Box::new(e)))?
.collect();
resolver.lookup(host).await.map_err(ConnectError::Resolver) resolver.lookup(host).await.map_err(ConnectError::Resolver)
} }
} }