hackclub/burrow
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions 4

Add handling for connection expiration

Browse source
This commit is contained in:
Jett Chen 2024-01-21 03:44:58 +08:00 • committed by Conrad Kramer
parent 6990f90c2e
commit 7d8958e0e7
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
burrow/src/wireguard/pcb.rs
View file

@ -5,7 +5,9 @@ use fehler::throws;
use ip_network::IpNetwork; use ip_network::IpNetwork;
use rand::random; use rand::random;
use tokio::{net::UdpSocket, sync::RwLock, task::JoinHandle}; use tokio::{net::UdpSocket, sync::RwLock, task::JoinHandle};
use tokio::io::AsyncWrite;
use tun::tokio::TunInterface; use tun::tokio::TunInterface;
use crate::wireguard::noise::errors::WireGuardError;
use super::{ use super::{
noise::{TunnResult, Tunnel}, noise::{TunnResult, Tunnel},
@ -62,6 +64,7 @@ impl PeerPcb {
tracing::debug!("{}: waiting for packet", rid); tracing::debug!("{}: waiting for packet", rid);
let guard = self.socket.read().await; let guard = self.socket.read().await;
let Some(socket) = guard.as_ref() else { let Some(socket) = guard.as_ref() else {
self.open_if_closed().await?;
continue continue
}; };
let mut res_buf = [0; 1500]; let mut res_buf = [0; 1500];
@ -136,6 +139,10 @@ impl PeerPcb {
pub async fn update_timers(&self, dst: &mut [u8]) -> Result<(), Error> { pub async fn update_timers(&self, dst: &mut [u8]) -> Result<(), Error> {
match self.tunnel.write().await.update_timers(dst) { match self.tunnel.write().await.update_timers(dst) {
TunnResult::Done => {} TunnResult::Done => {}
TunnResult::Err(WireGuardError::ConnectionExpired) => {
tracing::debug!("Connection expired, closing socket");
self.socket.write().await.take();
}
TunnResult::Err(e) => { TunnResult::Err(e) => {
tracing::error!(message = "Update timers error", error = ?e) tracing::error!(message = "Update timers error", error = ?e)
} }