suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-13 21:27:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix keepalive on accepted tcp proxy connection (#1302)

Browse Source
This commit is contained in:
Sijie.Sun
2025-08-26 23:30:30 +08:00
committed by GitHub
parent 719a1fe7cf
commit 0ceb58586b
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
easytier/src/gateway/tcp_proxy.rs
View File

@@ -71,27 +71,12 @@ impl NatDstConnector for NatDstTcpConnector {
return Err(e.into()); return Err(e.into());
} }
}; };
if let Err(e) = socket.set_nodelay(true) {
tracing::warn!("set_nodelay failed, ignore it: {:?}", e);
}
const TCP_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
const TCP_KEEPALIVE_INTERVAL: Duration = Duration::from_secs(2);
const TCP_KEEPALIVE_RETRIES: u32 = 2;
let stream = timeout(Duration::from_secs(10), socket.connect(nat_dst)) let stream = timeout(Duration::from_secs(10), socket.connect(nat_dst))
.await? .await?
.with_context(|| format!("connect to nat dst failed: {:?}", nat_dst))?; .with_context(|| format!("connect to nat dst failed: {:?}", nat_dst))?;
let ka = TcpKeepalive::new() prepare_kernel_tcp_socket(&stream)?;
.with_time(TCP_KEEPALIVE_TIME)
.with_interval(TCP_KEEPALIVE_INTERVAL);
#[cfg(not(target_os = "windows"))]
let ka = ka.with_retries(TCP_KEEPALIVE_RETRIES);
let sf = SockRef::from(&stream);
sf.set_tcp_keepalive(&ka)?;
Ok(stream) Ok(stream)
} }
@@ -280,11 +265,33 @@ enum ProxyTcpListener {
SmolTcpListener(SmolTcpListener), SmolTcpListener(SmolTcpListener),
} }
fn prepare_kernel_tcp_socket(stream: &TcpStream) -> Result<()> {
const TCP_KEEPALIVE_TIME: Duration = Duration::from_secs(5);
const TCP_KEEPALIVE_INTERVAL: Duration = Duration::from_secs(2);
const TCP_KEEPALIVE_RETRIES: u32 = 2;
let ka = TcpKeepalive::new()
.with_time(TCP_KEEPALIVE_TIME)
.with_interval(TCP_KEEPALIVE_INTERVAL);
#[cfg(not(target_os = "windows"))]
let ka = ka.with_retries(TCP_KEEPALIVE_RETRIES);
let sf = SockRef::from(&stream);
sf.set_tcp_keepalive(&ka)?;
if let Err(e) = sf.set_nodelay(true) {
tracing::warn!("set_nodelay failed, ignore it: {:?}", e);
}
Ok(())
}
impl ProxyTcpListener { impl ProxyTcpListener {
pub async fn accept(&mut self) -> Result<(ProxyTcpStream, SocketAddr)> { pub async fn accept(&mut self) -> Result<(ProxyTcpStream, SocketAddr)> {
match self { match self {
Self::KernelTcpListener(listener) => { Self::KernelTcpListener(listener) => {
let (stream, addr) = listener.accept().await?; let (stream, addr) = listener.accept().await?;
prepare_kernel_tcp_socket(&stream)?;
Ok((ProxyTcpStream::KernelTcpStream(stream), addr)) Ok((ProxyTcpStream::KernelTcpStream(stream), addr))
} }
#[cfg(feature = "smoltcp")] #[cfg(feature = "smoltcp")]