astelm/telemt
1
0
Fork 0
mirror of https://github.com/telemt/telemt.git synced 2026-05-22 19:51:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prioritize Relay Flow Cancellation over Buffered Writes

Browse Source
This commit is contained in:
Alexey
2026-05-21 20:35:25 +03:00
parent 98c985091c
commit 885258b85e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/proxy/middle_relay/d2c.rs
View File

@@ -437,8 +437,9 @@ where
W: AsyncWrite + Unpin + Send + 'static, W: AsyncWrite + Unpin + Send + 'static,
{ {
tokio::select! { tokio::select! {
result = client_writer.write_all(bytes) => result.map_err(ProxyError::Io), biased;
_ = cancel.cancelled() => Err(ProxyError::MiddleClientWriterCancelled), _ = cancel.cancelled() => Err(ProxyError::MiddleClientWriterCancelled),
result = client_writer.write_all(bytes) => result.map_err(ProxyError::Io),
} }
} }
@@ -450,7 +451,8 @@ where
W: AsyncWrite + Unpin + Send + 'static, W: AsyncWrite + Unpin + Send + 'static,
{ {
tokio::select! { tokio::select! {
result = client_writer.flush() => result.map_err(ProxyError::Io), biased;
_ = cancel.cancelled() => Err(ProxyError::MiddleClientWriterCancelled), _ = cancel.cancelled() => Err(ProxyError::MiddleClientWriterCancelled),
result = client_writer.flush() => result.map_err(ProxyError::Io),
} }
} }