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

chore(connlib): remove Mutex from windows TUN device (#4472)

Browse Source 
This is a legacy from before the single-threaded connlib design.
This commit is contained in:
Thomas Eizinger
2024-04-04 01:12:39 +11:00
committed by GitHub
parent 97e6a92e39
commit f2bf56a777
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,7 @@ pub struct Tun {
/// The index of our network adapter, we can use this when asking Windows to add / remove routes / DNS rules
/// It's stable across app restarts and I'm assuming across system reboots too.
iface_idx: u32,
// TODO: Get rid of this mutex. It's a hack to deal with `poll_read` taking a `&self` instead of `&mut self`
packet_rx: std::sync::Mutex<mpsc::Receiver<wintun::Packet>>,
packet_rx: mpsc::Receiver<wintun::Packet>,
_recv_thread: std::thread::JoinHandle<()>,
session: Arc<wintun::Session>,
routes: HashSet<IpNetwork>,
@@ -93,7 +92,6 @@ impl Tun {
let (packet_tx, packet_rx) = mpsc::channel(5);
let recv_thread = start_recv_thread(packet_tx, Arc::clone(&session))?;
let packet_rx = std::sync::Mutex::new(packet_rx);
Ok(Self {
adapter,
@@ -206,10 +204,8 @@ impl Tun {
Ok(())
}
pub fn poll_read(&self, buf: &mut [u8], cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
let mut packet_rx = self.packet_rx.try_lock().unwrap();
let pkt = ready!(packet_rx.poll_recv(cx));
pub fn poll_read(&mut self, buf: &mut [u8], cx: &mut Context<'_>) -> Poll<io::Result<usize>> {
let pkt = ready!(self.packet_rx.poll_recv(cx));
match pkt {
Some(pkt) => {