hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(udp): Use activity based timeout instead of hard deadline

Browse source
This commit is contained in:
Σrebe - Romain GERARD 2023-11-01 11:20:45 +01:00
parent 9a5ba4783b
commit 9883b8b32b
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
2 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tunnel/io.rs
View file

@ -1,7 +1,6 @@
use fastwebsockets::{Frame, OpCode, Payload, WebSocketError, WebSocketRead, WebSocketWrite};
use futures_util::pin_mut;
use hyper::upgrade::Upgraded;
use std::pin::Pin;
use std::time::Duration;
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadHalf, WriteHalf};
@ -25,8 +24,8 @@ pub(super) async fn propagate_read(
// We do our own pin_mut! to avoid shadowing timeout and be able to reset it, on next loop iteration
// We reuse the future to avoid creating a timer in the tight loop
let mut timeout_unpin = tokio::time::sleep(ping_frequency);
let mut timeout = unsafe { Pin::new_unchecked(&mut timeout_unpin) };
let timeout = tokio::time::interval_at(tokio::time::Instant::now() + ping_frequency, ping_frequency);
pin_mut!(timeout);
pin_mut!(local_rx);
loop {
@ -37,12 +36,10 @@ pub(super) async fn propagate_read(
_ = close_tx.closed() => break,
_ = &mut timeout => {
_ = timeout.tick() => {
debug!("sending ping to keep websocket connection alive");
ws_tx.write_frame(Frame::new(true, OpCode::Ping, None, Payload::BorrowedMut(&mut []))).await?;
timeout_unpin = tokio::time::sleep(ping_frequency);
timeout = unsafe { Pin::new_unchecked(&mut timeout_unpin) };
continue;
}
};
@ -51,7 +48,7 @@ pub(super) async fn propagate_read(
Ok(0) => break,
Ok(read_len) => read_len,
Err(err) => {
warn!("error while reading incoming bytes from local tx tunnel {}", err);
warn!("error while reading incoming bytes from local tx tunnel: {}", err);
break;
}
};