Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 21:06:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set TCP_NODELAY and do our own buffering on IMAP sockets

Browse Source 
This way flush() issued by the IMAP client actually
results in sending the command over the network immediately.
Without TCP_NODELAY, the command may be buffered in the socket buffer,
expecting more write() calls.
This commit is contained in:
link2xt
2022-12-30 12:46:28 +00:00
parent 45462fb47e
commit a8dad96d87
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/socks.rs
View File

@@ -6,6 +6,7 @@ use std::time::Duration;
use anyhow::{Context as _, Result};
pub use async_smtp::ServerAddress;
use tokio::io::BufWriter;
use tokio::net::{self, TcpStream};
use tokio::time::timeout;
use tokio_io_timeout::TimeoutStream;
@@ -58,15 +59,17 @@ impl Socks5Config {
&self,
target_addr: impl net::ToSocketAddrs,
timeout_val: Duration,
) -> Result<Socks5Stream<Pin<Box<TimeoutStream<TcpStream>>>>> {
) -> Result<Socks5Stream<BufWriter<Pin<Box<TimeoutStream<TcpStream>>>>>> {
let tcp_stream = timeout(timeout_val, TcpStream::connect(target_addr))
.await
.context("connection timeout")?
.context("connection failure")?;
let mut timeout_stream = TimeoutStream::new(tcp_stream);
timeout_stream.set_write_timeout(Some(timeout_val));
timeout_stream.set_read_timeout(Some(timeout_val));
let timeout_stream = Box::pin(timeout_stream);
let pinned_stream = Box::pin(timeout_stream);
let buffered_stream = BufWriter::new(pinned_stream);
let authentication_method = if let Some((username, password)) = self.user_password.as_ref()
{
@@ -78,7 +81,7 @@ impl Socks5Config {
None
};
let socks_stream =
Socks5Stream::use_stream(timeout_stream, authentication_method, Config::default())
Socks5Stream::use_stream(buffered_stream, authentication_method, Config::default())
.await?;
Ok(socks_stream)