diff --git a/burrow/src/daemon/mod.rs b/burrow/src/daemon/mod.rs index e086452..bfbc1a2 100644 --- a/burrow/src/daemon/mod.rs +++ b/burrow/src/daemon/mod.rs @@ -47,7 +47,7 @@ pub async fn daemon_main() -> Result<()> { let mut _tun = tun::TunInterface::new()?; _tun.set_ipv4_addr(Ipv4Addr::from([192, 168, 1, 10]))?; - _tun.set_timeout(Some(std::time::Duration::from_secs(1)))?; + _tun.set_timeout(Some(std::time::Duration::from_millis(10)))?; let tun = tun::tokio::TunInterface::new(_tun)?; let private_key = parse_secret_key("GNqIAOCRxjl/cicZyvkvpTklgQuUmGUIEkH7IXF/sEE=")?; diff --git a/burrow/src/wireguard/iface.rs b/burrow/src/wireguard/iface.rs index 7f6473c..cfd19a5 100755 --- a/burrow/src/wireguard/iface.rs +++ b/burrow/src/wireguard/iface.rs @@ -101,12 +101,12 @@ impl Interface { let outgoing = async move { loop { - log::debug!("starting loop..."); + // log::debug!("starting loop..."); let mut buf = [0u8; 3000]; let src = { - log::debug!("awaiting read..."); - let src = match timeout(Duration::from_secs(2), tun.write().await.recv(&mut buf[..])).await { + // log::debug!("awaiting read..."); + let src = match timeout(Duration::from_millis(10), tun.write().await.recv(&mut buf[..])).await { Ok(Ok(len)) => &buf[..len], Ok(Err(e)) => {continue} Err(_would_block) => { diff --git a/burrow/src/wireguard/pcb.rs b/burrow/src/wireguard/pcb.rs index 4ec63c5..840eda8 100755 --- a/burrow/src/wireguard/pcb.rs +++ b/burrow/src/wireguard/pcb.rs @@ -68,15 +68,15 @@ impl PeerPcb { let rid: i32 = random(); log::debug!("start read loop {}", rid); loop{ - log::debug!("{}: waiting for packet", rid); + // log::debug!("{}: waiting for packet", rid); let Some(socket) = &self.socket else { continue }; let mut res_buf = [0;1500]; - log::debug!("{} : waiting for readability on {:?}", rid, socket); - match timeout(Duration::from_secs(2), socket.readable()).await { + // log::debug!("{} : waiting for readability on {:?}", rid, socket); + match timeout(Duration::from_millis(10), socket.readable()).await { Err(e) => { - log::debug!("{}: timeout waiting for readability on {:?}", rid, e); + // log::debug!("{}: timeout waiting for readability on {:?}", rid, e); continue } Ok(Err(e)) => { diff --git a/tun/src/tokio/mod.rs b/tun/src/tokio/mod.rs index 8d23b7b..2ade0a1 100644 --- a/tun/src/tokio/mod.rs +++ b/tun/src/tokio/mod.rs @@ -30,15 +30,12 @@ impl TunInterface { // #[instrument] pub async fn recv(&mut self, buf: &mut [u8]) -> io::Result { loop { - log::debug!("TunInterface receiving..."); + // log::debug!("TunInterface receiving..."); let mut guard = self.inner.readable_mut().await?; - log::debug!("Got! readable_mut"); + // log::debug!("Got! readable_mut"); match guard.try_io(|inner| { - // log::debug!("Got! {:#?}", inner); let raw_ref = (*inner).get_mut(); - // log::debug!("Got mut ref! {:#?}", raw_ref); let recved = raw_ref.recv(buf); - // log::debug!("Got recved! {:#?}", recved); recved }) { Ok(result) => {