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

Process all TCP virtual client sockets in one poll

Browse source
This commit is contained in:
Aram 🍐 2022-01-08 15:11:59 -05:00
parent daa2362915
commit d9bccb79e5
1 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/virtual_iface/tcp.rs
View file

@ -113,6 +113,20 @@ impl VirtualInterfacePoll for TcpVirtualInterface {
} => { } => {
let loop_start = smoltcp::time::Instant::now(); let loop_start = smoltcp::time::Instant::now();
// Find closed sockets
port_client_handle_map.retain(|virtual_port, client_handle| {
let client_socket = iface.get_socket::<TcpSocket>(*client_handle);
if client_socket.state() == TcpState::Closed {
endpoint.send(Event::ClientConnectionDropped(*virtual_port));
send_queue.remove(virtual_port);
iface.remove_socket(*client_handle);
false
} else {
// Not closed, retain
true
}
});
match iface.poll(loop_start) { match iface.poll(loop_start) {
Ok(processed) if processed => { Ok(processed) if processed => {
trace!("TCP virtual interface polled some packets to be processed"); trace!("TCP virtual interface polled some packets to be processed");
@ -121,7 +135,6 @@ impl VirtualInterfacePoll for TcpVirtualInterface {
_ => {} _ => {}
} }
// Find client socket send data to
for (virtual_port, client_handle) in port_client_handle_map.iter() { for (virtual_port, client_handle) in port_client_handle_map.iter() {
let client_socket = iface.get_socket::<TcpSocket>(*client_handle); let client_socket = iface.get_socket::<TcpSocket>(*client_handle);
if client_socket.can_send() { if client_socket.can_send() {
@ -143,24 +156,16 @@ impl VirtualInterfacePoll for TcpVirtualInterface {
); );
} }
} }
break;
} else if client_socket.state() == TcpState::CloseWait { } else if client_socket.state() == TcpState::CloseWait {
client_socket.close(); client_socket.close();
break;
} }
} }
} }
}
// Find client socket recv data from
for (virtual_port, client_handle) in port_client_handle_map.iter() {
let client_socket = iface.get_socket::<TcpSocket>(*client_handle);
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) => {
if !data.is_empty() { if !data.is_empty() {
endpoint.send(Event::RemoteData(*virtual_port, data)); endpoint.send(Event::RemoteData(*virtual_port, data));
break;
} }
} }
Err(e) => { Err(e) => {
@ -172,20 +177,6 @@ impl VirtualInterfacePoll for TcpVirtualInterface {
} }
} }
// Find closed sockets
port_client_handle_map.retain(|virtual_port, client_handle| {
let client_socket = iface.get_socket::<TcpSocket>(*client_handle);
if client_socket.state() == TcpState::Closed {
endpoint.send(Event::ClientConnectionDropped(*virtual_port));
send_queue.remove(virtual_port);
iface.remove_socket(*client_handle);
false
} else {
// Not closed, retain
true
}
});
// The virtual interface determines the next time to poll (this is to reduce unnecessary polls) // The virtual interface determines the next time to poll (this is to reduce unnecessary polls)
next_poll = match iface.poll_delay(loop_start) { next_poll = match iface.poll_delay(loop_start) {
Some(smoltcp::time::Duration::ZERO) => None, Some(smoltcp::time::Duration::ZERO) => None,
@ -223,11 +214,7 @@ impl VirtualInterfacePoll for TcpVirtualInterface {
} }
Event::ClientConnectionDropped(virtual_port) => { Event::ClientConnectionDropped(virtual_port) => {
if let Some(client_handle) = port_client_handle_map.get(&virtual_port) { if let Some(client_handle) = port_client_handle_map.get(&virtual_port) {
let client_handle = *client_handle; let client_socket = iface.get_socket::<TcpSocket>(*client_handle);
port_client_handle_map.remove(&virtual_port);
send_queue.remove(&virtual_port);
let client_socket = iface.get_socket::<TcpSocket>(client_handle);
client_socket.close(); client_socket.close();
next_poll = None; next_poll = None;
} }