github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(windows): reduce nesting in wintun recv-thread (#5573)

Browse Source 
Related: #5571.
This commit is contained in:
Thomas Eizinger
2024-07-02 02:33:59 +10:00
committed by GitHub
parent f4d9a204df
commit 02f5c67974
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rust/connlib/tunnel/src/device_channel/tun_windows.rs
View File

@@ -262,33 +262,33 @@ fn start_recv_thread(
) -> io::Result<std::thread::JoinHandle<()>> {
std::thread::Builder::new()
.name("Firezone wintun worker".into())
.spawn(move || {
loop {
match session.receive_blocking() {
Ok(pkt) => {
// Use `blocking_send` so that if connlib is behind by a few packets,
// Wintun will queue up new packets in its ring buffer while we
// wait for our MPSC channel to clear.
// Unfortunately we don't know if Wintun is dropping packets, since
// it doesn't expose a sequence number or anything.
match packet_tx.blocking_send(pkt) {
Ok(()) => {}
Err(_) => {
tracing::info!(
"Stopping outbound worker thread because the packet channel closed"
);
break;
}
}
}
Err(wintun::Error::ShuttingDown) => {
tracing::info!("Stopping outbound worker thread because Wintun is shutting down");
break;
}
Err(e) => {
tracing::error!("wintun::Session::receive_blocking: {e:#?}");
break;
}
.spawn(move || loop {
let pkt = match session.receive_blocking() {
Ok(pkt) => pkt,
Err(wintun::Error::ShuttingDown) => {
tracing::info!(
"Stopping outbound worker thread because Wintun is shutting down"
);
break;
}
Err(e) => {
tracing::error!("wintun::Session::receive_blocking: {e:#?}");
break;
}
};
// Use `blocking_send` so that if connlib is behind by a few packets,
// Wintun will queue up new packets in its ring buffer while we
// wait for our MPSC channel to clear.
// Unfortunately we don't know if Wintun is dropping packets, since
// it doesn't expose a sequence number or anything.
match packet_tx.blocking_send(pkt) {
Ok(()) => {}
Err(_) => {
tracing::info!(
"Stopping outbound worker thread because the packet channel closed"
);
break;
}
}
})