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

Reduce sleepers

Browse source
This commit is contained in:
Aram 🍐 2021-10-13 22:22:17 -04:00
parent 4f10afd323
commit 5ba111002f
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -29,7 +29,7 @@ pub const MAX_PACKET: usize = 65536;
#[tokio::main] #[tokio::main]
async fn main() -> anyhow::Result<()> { async fn main() -> anyhow::Result<()> {
pretty_env_logger::init_custom_env("ONETUN_LOG"); pretty_env_logger::try_init_timed_custom_env("ONETUN_LOG").unwrap();
let config = Config::from_args().with_context(|| "Failed to read config")?; let config = Config::from_args().with_context(|| "Failed to read config")?;
let port_pool = Arc::new(PortPool::new()); let port_pool = Arc::new(PortPool::new());
@ -236,7 +236,7 @@ async fn handle_tcp_proxy_connection(
break; break;
} }
tokio::time::sleep(Duration::from_millis(5)).await; tokio::time::sleep(Duration::from_millis(1)).await;
} }
trace!("[{}] TCP socket handler task terminated", virtual_port); trace!("[{}] TCP socket handler task terminated", virtual_port);
@ -370,11 +370,7 @@ async fn virtual_tcp_interface(
} }
} }
match virtual_interface.poll_delay(&socket_set, loop_start) { tokio::time::sleep(Duration::from_millis(1)).await;
None => tokio::time::sleep(Duration::from_millis(1)).await,
Some(smoltcp::time::Duration::ZERO) => {}
Some(delay) => tokio::time::sleep(Duration::from_millis(delay.millis())).await,
};
} }
trace!("[{}] Virtual interface task terminated", virtual_port); trace!("[{}] Virtual interface task terminated", virtual_port);
Ok(()) Ok(())

15
src/wg.rs
View file

@ -46,6 +46,7 @@ impl WireGuardTunnel {
/// Encapsulates and sends an IP packet through to the WireGuard endpoint. /// Encapsulates and sends an IP packet through to the WireGuard endpoint.
pub async fn send_ip_packet(&self, packet: &[u8]) -> anyhow::Result<()> { pub async fn send_ip_packet(&self, packet: &[u8]) -> anyhow::Result<()> {
trace_ip_packet("Sending IP packet", packet);
let mut send_buf = [0u8; MAX_PACKET]; let mut send_buf = [0u8; MAX_PACKET];
match self.peer.encapsulate(packet, &mut send_buf) { match self.peer.encapsulate(packet, &mut send_buf) {
TunnResult::WriteToNetwork(packet) => { TunnResult::WriteToNetwork(packet) => {
@ -109,7 +110,7 @@ impl WireGuardTunnel {
} }
TunnResult::Done => { TunnResult::Done => {
// Sleep for a bit // Sleep for a bit
tokio::time::sleep(Duration::from_millis(100)).await; tokio::time::sleep(Duration::from_millis(1)).await;
} }
other => { other => {
warn!("Unexpected WireGuard routine task state: {:?}", other); warn!("Unexpected WireGuard routine task state: {:?}", other);
@ -132,7 +133,7 @@ impl WireGuardTunnel {
Err(e) => { Err(e) => {
error!("Failed to read from WireGuard endpoint: {:?}", e); error!("Failed to read from WireGuard endpoint: {:?}", e);
// Sleep a little bit and try again // Sleep a little bit and try again
tokio::time::sleep(Duration::from_millis(100)).await; tokio::time::sleep(Duration::from_millis(1)).await;
continue; continue;
} }
}; };
@ -172,7 +173,7 @@ impl WireGuardTunnel {
); );
// For debugging purposes: parse packet // For debugging purposes: parse packet
trace_ip_packet(packet); trace_ip_packet("Received IP packet", packet);
// Broadcast IP packet // Broadcast IP packet
match self.ip_broadcast_tx.send(packet.to_vec()) { match self.ip_broadcast_tx.send(packet.to_vec()) {
@ -206,17 +207,19 @@ impl WireGuardTunnel {
} }
} }
fn trace_ip_packet(packet: &[u8]) { fn trace_ip_packet(message: &str, packet: &[u8]) {
if log_enabled!(Level::Trace) { if log_enabled!(Level::Trace) {
use smoltcp::wire::*; use smoltcp::wire::*;
match IpVersion::of_packet(&packet) { match IpVersion::of_packet(&packet) {
Ok(IpVersion::Ipv4) => trace!( Ok(IpVersion::Ipv4) => trace!(
"IPv4 packet received: {}", "{}: {}",
message,
PrettyPrinter::<Ipv4Packet<&mut [u8]>>::new("", &packet) PrettyPrinter::<Ipv4Packet<&mut [u8]>>::new("", &packet)
), ),
Ok(IpVersion::Ipv6) => trace!( Ok(IpVersion::Ipv6) => trace!(
"IPv6 packet received: {}", "{}: {}",
message,
PrettyPrinter::<Ipv6Packet<&mut [u8]>>::new("", &packet) PrettyPrinter::<Ipv6Packet<&mut [u8]>>::new("", &packet)
), ),
_ => {} _ => {}