1
0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-27 18:02:58 +01:00

allow to skip name resolution

This commit is contained in:
Nikolay Kim 2018-11-21 08:07:04 -10:00
parent 410204a41e
commit c62567f85f
3 changed files with 74 additions and 19 deletions

View File

@ -1,5 +1,12 @@
# Changes # Changes
## [0.2.4] - 2018-11-21
### Added
* Allow to skip name resolution stage in Connector
## [0.2.3] - 2018-11-17 ## [0.2.3] - 2018-11-17
### Added ### Added

View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-net" name = "actix-net"
version = "0.2.3" version = "0.2.4"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix net - framework for the compisible network services for Rust (experimental)" description = "Actix net - framework for the compisible network services for Rust (experimental)"
readme = "README.md" readme = "README.md"

View File

@ -4,10 +4,9 @@ use std::net::{IpAddr, SocketAddr};
use std::time::Duration; use std::time::Duration;
use std::{fmt, io}; use std::{fmt, io};
use futures::{ use futures::future::{ok, Either, FutureResult};
future::{ok, FutureResult}, use futures::{Async, Future, Poll};
Async, Future, Poll,
};
use tokio_tcp::{ConnectFuture, TcpStream}; use tokio_tcp::{ConnectFuture, TcpStream};
use trust_dns_resolver::config::{ResolverConfig, ResolverOpts}; use trust_dns_resolver::config::{ResolverConfig, ResolverOpts};
use trust_dns_resolver::system_conf::read_system_conf; use trust_dns_resolver::system_conf::read_system_conf;
@ -58,17 +57,24 @@ impl From<io::Error> for ConnectorError {
/// Connect request /// Connect request
#[derive(Eq, PartialEq, Debug, Hash)] #[derive(Eq, PartialEq, Debug, Hash)]
pub struct Connect { pub struct Connect {
pub host: String, pub kind: ConnectKind,
pub port: u16,
pub timeout: Duration, pub timeout: Duration,
} }
#[derive(Eq, PartialEq, Debug, Hash)]
pub enum ConnectKind {
Host { host: String, port: u16 },
Addr { host: String, addr: SocketAddr },
}
impl Connect { impl Connect {
/// Create new `Connect` instance. /// Create new `Connect` instance.
pub fn new<T: AsRef<str>>(host: T, port: u16) -> Connect { pub fn new<T: AsRef<str>>(host: T, port: u16) -> Connect {
Connect { Connect {
port, kind: ConnectKind::Host {
host: host.as_ref().to_owned(), host: host.as_ref().to_owned(),
port,
},
timeout: Duration::from_secs(1), timeout: Duration::from_secs(1),
} }
} }
@ -82,12 +88,25 @@ impl Connect {
.parse::<u16>() .parse::<u16>()
.map_err(|_| ConnectorError::InvalidInput)?; .map_err(|_| ConnectorError::InvalidInput)?;
Ok(Connect { Ok(Connect {
port, kind: ConnectKind::Host {
host: host.to_owned(), host: host.to_owned(),
port,
},
timeout: Duration::from_secs(1), timeout: Duration::from_secs(1),
}) })
} }
/// Create new `Connect` instance from host and address. Connector skips name resolution stage for such connect messages.
pub fn with_address<T: Into<String>>(host: T, addr: SocketAddr) -> Connect {
Connect {
kind: ConnectKind::Addr {
addr,
host: host.into(),
},
timeout: Duration::from_secs(1),
}
}
/// Set connect timeout /// Set connect timeout
/// ///
/// By default timeout is set to a 1 second. /// By default timeout is set to a 1 second.
@ -99,19 +118,25 @@ impl Connect {
impl RequestHost for Connect { impl RequestHost for Connect {
fn host(&self) -> &str { fn host(&self) -> &str {
&self.host match self.kind {
ConnectKind::Host { ref host, port: _ } => host,
ConnectKind::Addr { ref host, addr: _ } => host,
}
} }
} }
impl RequestPort for Connect { impl RequestPort for Connect {
fn port(&self) -> u16 { fn port(&self) -> u16 {
self.port match self.kind {
ConnectKind::Host { host: _, port } => port,
ConnectKind::Addr { host: _, addr } => addr.port(),
}
} }
} }
impl fmt::Display for Connect { impl fmt::Display for Connect {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}:{}", self.host, self.port) write!(f, "{}:{}", self.host(), self.port())
} }
} }
@ -174,16 +199,25 @@ impl Service for Connector {
type Request = Connect; type Request = Connect;
type Response = (Connect, TcpStream); type Response = (Connect, TcpStream);
type Error = ConnectorError; type Error = ConnectorError;
type Future = ConnectorFuture; type Future = Either<ConnectorFuture, ConnectorTcpFuture>;
fn poll_ready(&mut self) -> Poll<(), Self::Error> { fn poll_ready(&mut self) -> Poll<(), Self::Error> {
Ok(Async::Ready(())) Ok(Async::Ready(()))
} }
fn call(&mut self, req: Self::Request) -> Self::Future { fn call(&mut self, req: Self::Request) -> Self::Future {
ConnectorFuture { match req.kind {
fut: self.resolver.call(req), ConnectKind::Host { host: _, port: _ } => Either::A(ConnectorFuture {
fut2: None, fut: self.resolver.call(req),
fut2: None,
}),
ConnectKind::Addr { host: _, addr } => {
let mut addrs = VecDeque::new();
addrs.push_back(addr.ip());
Either::B(ConnectorTcpFuture {
fut: TcpConnectorResponse::new(req, addrs),
})
}
} }
} }
} }
@ -216,6 +250,20 @@ impl Future for ConnectorFuture {
} }
} }
#[doc(hidden)]
pub struct ConnectorTcpFuture {
fut: TcpConnectorResponse<Connect>,
}
impl Future for ConnectorTcpFuture {
type Item = (Connect, TcpStream);
type Error = ConnectorError;
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
self.fut.poll().map_err(ConnectorError::IoError)
}
}
/// Tcp stream connector service /// Tcp stream connector service
pub struct TcpConnector<T: RequestPort>(PhantomData<T>); pub struct TcpConnector<T: RequestPort>(PhantomData<T>);
@ -325,7 +373,7 @@ impl Service for DefaultConnector {
#[doc(hidden)] #[doc(hidden)]
pub struct DefaultConnectorFuture { pub struct DefaultConnectorFuture {
fut: ConnectorFuture, fut: Either<ConnectorFuture, ConnectorTcpFuture>,
} }
impl Future for DefaultConnectorFuture { impl Future for DefaultConnectorFuture {