suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 05:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

mpsc tunnel may be stuck by slow tcp stream, should not panic for this (#406)

Browse Source 
* mpsc tunnel may be stuck by slow tcp stream, should not panic for this
* disallow node connect to self
This commit is contained in:
Sijie.Sun
2024-10-11 00:12:14 +08:00
committed by GitHub
parent 7ab8cad1af
commit d2291628e0
3 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
easytier/src/tunnel/mpsc.rs
View File

@@ -70,17 +70,32 @@ impl<T: Tunnel> MpscTunnel<T> {
sink: &mut Pin<Box<dyn ZCPacketSink>>,
) -> Result<(), TunnelError> {
let item = rx.recv().await.with_context(|| "recv error")?;
sink.feed(item).await?;
while let Ok(item) = rx.try_recv() {
if let Err(e) = timeout(Duration::from_secs(5), sink.feed(item))
.await
.unwrap()
{
tracing::error!(?e, "feed error");
break;
match timeout(Duration::from_secs(10), async move {
sink.feed(item).await?;
while let Ok(item) = rx.try_recv() {
match sink.feed(item).await {
Err(e) => {
tracing::error!(?e, "feed error");
return Err(e);
}
Ok(_) => {}
}
}
sink.flush().await
})
.await
{
Ok(Ok(_)) => Ok(()),
Ok(Err(e)) => {
tracing::error!(?e, "forward error");
Err(e)
}
Err(e) => {
tracing::error!(?e, "forward timeout");
Err(e.into())
}
}
sink.flush().await
}
pub fn get_stream(&mut self) -> Pin<Box<dyn ZCPacketStream>> {