mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 21:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Set nodelay to accept/connect sockets

Browse source
This commit is contained in:
Nikolay Kim 2021-02-28 09:21:12 +06:00
parent d58c6c6311
commit 78dd4e5fbd
5 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex/CHANGES.md
View file

@ -6,6 +6,8 @@
* Do not set `reuse_address` for tcp listener on window os
* Set nodelay to accept/connect sockets
* Update ntex-router v0.4.1
* Update cookie v0.15.0

4
ntex/Cargo.toml
View file

@ -50,8 +50,8 @@ derive_more = "0.99.11"
either = "1.6.1"
encoding_rs = "0.8.26"
futures = "0.3.13"
ahash = "0.7.1"
h2 = "0.3"
ahash = "0.7.2"
h2 = "0.3.1"
http = "0.2.1"
httparse = "1.3"
log = "0.4"

25
ntex/src/connect/service.rs
View file

@ -170,6 +170,16 @@ impl<T: Address> TcpConnectorResponse<T> {
},
}
}
fn can_continue(&self, err: &io::Error) -> bool {
trace!(
"TCP connector - failed to connect to connecting to {:?} port: {} err: {:?}",
self.req.as_ref().unwrap().host(),
self.port,
err
);
!(self.addrs.is_none() || self.addrs.as_ref().unwrap().is_empty())
}
}
impl<T: Address> Future for TcpConnectorResponse<T> {
@ -183,6 +193,12 @@ impl<T: Address> Future for TcpConnectorResponse<T> {
if let Some(new) = this.stream.as_mut() {
match new.as_mut().poll(cx) {
Poll::Ready(Ok(sock)) => {
if let Err(err) = sock.set_nodelay(true) {
if !this.can_continue(&err) {
return Poll::Ready(Err(err.into()));
}
}
let req = this.req.take().unwrap();
trace!(
"TCP connector - successfully connected to connecting to {:?} - {:?}",
@ -192,14 +208,7 @@ impl<T: Address> Future for TcpConnectorResponse<T> {
}
Poll::Pending => return Poll::Pending,
Poll::Ready(Err(err)) => {
trace!(
"TCP connector - failed to connect to connecting to {:?} port: {}",
this.req.as_ref().unwrap().host(),
this.port,
);
if this.addrs.is_none()
|| this.addrs.as_ref().unwrap().is_empty()
{
if !this.can_continue(&err) {
return Poll::Ready(Err(err.into()));
}
}

2
ntex/src/server/service.rs
View file

@ -85,7 +85,7 @@ where
match req {
ServerMessage::Connect(stream) => {
let stream = FromStream::from_stream(stream).map_err(|e| {
error!("Can not convert to an async tcp stream: {}", e);
error!("Can not convert to an async io stream: {}", e);
});
if let Ok(stream) = stream {

14
ntex/src/server/socket.rs
View file

@ -157,7 +157,9 @@ impl FromStream for TcpStream {
Stream::Tcp(stream) => {
use std::os::unix::io::{FromRawFd, IntoRawFd};
let fd = IntoRawFd::into_raw_fd(stream);
TcpStream::from_std(unsafe { FromRawFd::from_raw_fd(fd) })
let io = TcpStream::from_std(unsafe { FromRawFd::from_raw_fd(fd) })?;
io.set_nodelay(true)?;
Ok(io)
}
#[cfg(unix)]
Stream::Uds(_) => {
@ -174,7 +176,10 @@ impl FromStream for TcpStream {
Stream::Tcp(stream) => {
use std::os::windows::io::{FromRawSocket, IntoRawSocket};
let fd = IntoRawSocket::into_raw_socket(stream);
TcpStream::from_std(unsafe { FromRawSocket::from_raw_socket(fd) })
let io =
TcpStream::from_std(unsafe { FromRawSocket::from_raw_socket(fd) })?;
io.set_nodelay(true)?;
Ok(io)
}
#[cfg(unix)]
Stream::Uds(_) => {
@ -190,11 +195,10 @@ impl FromStream for crate::rt::net::UnixStream {
match sock {
Stream::Tcp(_) => panic!("Should not happen, bug in server impl"),
Stream::Uds(stream) => {
use crate::rt::net::UnixStream;
use std::os::unix::io::{FromRawFd, IntoRawFd};
let fd = IntoRawFd::into_raw_fd(stream);
crate::rt::net::UnixStream::from_std(unsafe {
FromRawFd::from_raw_fd(fd)
})
UnixStream::from_std(unsafe { FromRawFd::from_raw_fd(fd) })
}
}
}