From 48f0d381b0b9a5e8a81e4a62a4912865a3081af6 Mon Sep 17 00:00:00 2001
From: Rubens Brandao <git@rubens.io>
Date: Mon, 5 Apr 2021 11:04:19 -0300
Subject: Replace State tokio::sync::Mutex by std::sync::RwLock

---
 mumd/src/network/udp.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'mumd/src/network/udp.rs')

diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs
index 5996e43..1b5c373 100644
--- a/mumd/src/network/udp.rs
+++ b/mumd/src/network/udp.rs
@@ -9,7 +9,7 @@ use mumble_protocol::crypt::ClientCryptState;
 use mumble_protocol::ping::{PingPacket, PongPacket};
 use mumble_protocol::voice::VoicePacket;
 use mumble_protocol::Serverbound;
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::RwLock};
 use std::convert::TryFrom;
 use std::net::{Ipv6Addr, SocketAddr};
 use std::rc::Rc;
@@ -29,11 +29,11 @@ type UdpSender = SplitSink<UdpFramed<ClientCryptState>, (VoicePacket<Serverbound
 type UdpReceiver = SplitStream<UdpFramed<ClientCryptState>>;
 
 pub async fn handle(
-    state: Arc<Mutex<State>>,
+    state: Arc<RwLock<State>>,
     mut connection_info_receiver: watch::Receiver<Option<ConnectionInfo>>,
     mut crypt_state_receiver: mpsc::Receiver<ClientCryptState>,
 ) -> Result<(), UdpError> {
-    let receiver = state.lock().await.audio().input_receiver();
+    let receiver = state.read().unwrap().audio().input_receiver();
 
     loop {
         let connection_info = 'data: loop {
@@ -49,7 +49,7 @@ pub async fn handle(
         let sink = Arc::new(Mutex::new(sink));
         let source = Arc::new(Mutex::new(source));
 
-        let phase_watcher = state.lock().await.phase_receiver();
+        let phase_watcher = state.read().unwrap().phase_receiver();
         let last_ping_recv = AtomicU64::new(0);
 
         run_until(
@@ -119,7 +119,7 @@ async fn new_crypt_state(
 }
 
 async fn listen(
-    state: Arc<Mutex<State>>,
+    state: Arc<RwLock<State>>,
     source: Arc<Mutex<UdpReceiver>>,
     last_ping_recv: &AtomicU64,
 ) {
@@ -136,8 +136,8 @@ async fn listen(
         match packet {
             VoicePacket::Ping { timestamp } => {
                 state
-                    .lock() //TODO clean up unnecessary lock by only updating phase if it should change
-                    .await
+                    .read()
+                    .unwrap()
                     .broadcast_phase(StatePhase::Connected(VoiceStreamType::UDP));
                 last_ping_recv.store(timestamp, Ordering::Relaxed);
             }
@@ -149,8 +149,8 @@ async fn listen(
                 ..
             } => {
                 state
-                    .lock() //TODO change so that we only have to lock audio and not the whole state
-                    .await
+                    .read()
+                    .unwrap()
                     .audio()
                     .decode_packet_payload(VoiceStreamType::UDP, session_id, payload);
             }
@@ -159,7 +159,7 @@ async fn listen(
 }
 
 async fn send_pings(
-    state: Arc<Mutex<State>>,
+    state: Arc<RwLock<State>>,
     sink: Arc<Mutex<UdpSender>>,
     server_addr: SocketAddr,
     last_ping_recv: &AtomicU64,
@@ -173,8 +173,8 @@ async fn send_pings(
         if last_send.is_some() && last_send.unwrap() != last_recv {
             debug!("Sending TCP voice");
             state
-                .lock()
-                .await
+                .read()
+                .unwrap()
                 .broadcast_phase(StatePhase::Connected(VoiceStreamType::TCP));
         }
         match sink
-- 
cgit v1.2.1


From e01383af1c417666d42a802e44a1d1e98bbcf14e Mon Sep 17 00:00:00 2001
From: Rubens Brandao <git@rubens.io>
Date: Tue, 6 Apr 2021 15:18:55 -0300
Subject: Fix the import location and a possible deadlock

---
 mumd/src/network/udp.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mumd/src/network/udp.rs')

diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs
index 1b5c373..cc085b5 100644
--- a/mumd/src/network/udp.rs
+++ b/mumd/src/network/udp.rs
@@ -9,12 +9,12 @@ use mumble_protocol::crypt::ClientCryptState;
 use mumble_protocol::ping::{PingPacket, PongPacket};
 use mumble_protocol::voice::VoicePacket;
 use mumble_protocol::Serverbound;
-use std::{collections::HashMap, sync::RwLock};
+use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::net::{Ipv6Addr, SocketAddr};
 use std::rc::Rc;
 use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 use tokio::{join, net::UdpSocket};
 use tokio::sync::{mpsc, watch, Mutex};
 use tokio::time::{interval, Duration};
-- 
cgit v1.2.1