aramperes/onetun
1
0
Fork 0
mirror of https://github.com/aramperes/onetun.git synced 2025-09-09 06:38:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove unnecessary (and expensive) logic to stack packets together

Browse source
This commit is contained in:
Aram 🍐 2021-10-16 17:00:33 -04:00
parent 0981888a1a
commit 07edf9d2da
1 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main.rs
View file

@ -171,10 +171,6 @@ async fn handle_tcp_proxy_connection(
.expect("failed to wait for virtual client to be ready"); .expect("failed to wait for virtual client to be ready");
trace!("[{}] Virtual client is ready to send data", virtual_port); trace!("[{}] Virtual client is ready to send data", virtual_port);
// Data that has been received from the client, but hasn't been flushed to the
// virtual client just yet.
let mut unflushed_data = Vec::with_capacity(MAX_PACKET);
loop { loop {
if abort.load(Ordering::Relaxed) { if abort.load(Ordering::Relaxed) {
break; break;
@ -193,21 +189,14 @@ async fn handle_tcp_proxy_connection(
"[{}] Read {} bytes of TCP data from real client", "[{}] Read {} bytes of TCP data from real client",
virtual_port, size virtual_port, size
); );
unflushed_data.extend_from_slice(data); if let Err(e) = data_to_virtual_server_tx.send(data.to_vec()).await {
error!(
"[{}] Failed to dispatch data to virtual interface: {:?}",
virtual_port, e
);
}
} }
Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => { Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
trace!("[{}] Real client blocked; have {} bytes to flush", virtual_port, unflushed_data.len());
if !unflushed_data.is_empty() {
let data = unflushed_data;
// Reset unflushed data
unflushed_data = Vec::with_capacity(MAX_PACKET);
if let Err(e) = data_to_virtual_server_tx.send(data).await {
error!(
"[{}] Failed to dispatch data to virtual interface: {:?}",
virtual_port, e
);
}
}
continue; continue;
} }
Err(e) => { Err(e) => {
@ -368,6 +357,11 @@ async fn virtual_tcp_interface(
if client_socket.can_recv() { if client_socket.can_recv() {
match client_socket.recv(|buffer| (buffer.len(), buffer.to_vec())) { match client_socket.recv(|buffer| (buffer.len(), buffer.to_vec())) {
Ok(data) => { Ok(data) => {
trace!(
"[{}] Virtual client received {} bytes of data",
virtual_port,
data.len()
);
// Send it to the real client // Send it to the real client
if let Err(e) = data_to_real_client_tx.send(data).await { if let Err(e) = data_to_real_client_tx.send(data).await {
error!("[{}] Failed to dispatch data from virtual client to real client: {:?}", virtual_port, e); error!("[{}] Failed to dispatch data from virtual client to real client: {:?}", virtual_port, e);