From e431ecb6c5c8406bde6a54f40ee2f648cc0cec05 Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Mon, 5 Apr 2021 13:39:55 -0300 Subject: Separate the input and output audio --- 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 5996e43..a8e190d 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -33,7 +33,7 @@ pub async fn handle( mut connection_info_receiver: watch::Receiver>, mut crypt_state_receiver: mpsc::Receiver, ) -> Result<(), UdpError> { - let receiver = state.lock().await.audio().input_receiver(); + let receiver = state.lock().await.audio_input().input_receiver(); loop { let connection_info = 'data: loop { @@ -151,7 +151,7 @@ async fn listen( state .lock() //TODO change so that we only have to lock audio and not the whole state .await - .audio() + .audio_output() .decode_packet_payload(VoiceStreamType::UDP, session_id, payload); } } -- cgit v1.2.1 From 38270c4a2374c2ccc04597a28fb191af9d86b814 Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Mon, 5 Apr 2021 13:50:58 -0300 Subject: Rename audio functions and basic indentation --- mumd/src/network/udp.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mumd/src/network/udp.rs') diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index a8e190d..8614358 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -33,7 +33,7 @@ pub async fn handle( mut connection_info_receiver: watch::Receiver>, mut crypt_state_receiver: mpsc::Receiver, ) -> Result<(), UdpError> { - let receiver = state.lock().await.audio_input().input_receiver(); + let receiver = state.lock().await.audio_input().receiver(); loop { let connection_info = 'data: loop { -- cgit v1.2.1 From a39934e562fd2755fcb7b1ed271bcf3f31aaa0d5 Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Mon, 5 Apr 2021 11:04:19 -0300 Subject: Replace State tokio::sync::Mutex by std::sync::RwLock --- mumd/src/network/udp.rs | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'mumd/src/network/udp.rs') diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index 8614358..f24d4b4 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,15 @@ type UdpSender = SplitSink, (VoicePacket>; pub async fn handle( - state: Arc>, + state: Arc>, mut connection_info_receiver: watch::Receiver>, mut crypt_state_receiver: mpsc::Receiver, ) -> Result<(), UdpError> { +<<<<<<< HEAD let receiver = state.lock().await.audio_input().receiver(); +======= + let receiver = state.read().unwrap().audio().input_receiver(); +>>>>>>> 48f0d38 (Replace State tokio::sync::Mutex by std::sync::RwLock) loop { let connection_info = 'data: loop { @@ -49,7 +53,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 +123,7 @@ async fn new_crypt_state( } async fn listen( - state: Arc>, + state: Arc>, source: Arc>, last_ping_recv: &AtomicU64, ) { @@ -136,8 +140,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,9 +153,15 @@ async fn listen( .. } => { state +<<<<<<< HEAD .lock() //TODO change so that we only have to lock audio and not the whole state .await .audio_output() +======= + .read() + .unwrap() + .audio() +>>>>>>> 48f0d38 (Replace State tokio::sync::Mutex by std::sync::RwLock) .decode_packet_payload(VoiceStreamType::UDP, session_id, payload); } } @@ -159,7 +169,7 @@ async fn listen( } async fn send_pings( - state: Arc>, + state: Arc>, sink: Arc>, server_addr: SocketAddr, last_ping_recv: &AtomicU64, @@ -173,8 +183,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 14b0ce912735243e566a95838e9ed0c93a2e7f3e Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Fri, 9 Apr 2021 15:02:51 -0300 Subject: Resolved merge upstream conflicts --- mumd/src/network/udp.rs | 14 ++------------ 1 file changed, 2 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 f24d4b4..11a3f27 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -33,11 +33,7 @@ pub async fn handle( mut connection_info_receiver: watch::Receiver>, mut crypt_state_receiver: mpsc::Receiver, ) -> Result<(), UdpError> { -<<<<<<< HEAD - let receiver = state.lock().await.audio_input().receiver(); -======= - let receiver = state.read().unwrap().audio().input_receiver(); ->>>>>>> 48f0d38 (Replace State tokio::sync::Mutex by std::sync::RwLock) + let receiver = state.read().unwrap().audio_input().receiver(); loop { let connection_info = 'data: loop { @@ -153,15 +149,9 @@ async fn listen( .. } => { state -<<<<<<< HEAD - .lock() //TODO change so that we only have to lock audio and not the whole state - .await - .audio_output() -======= .read() .unwrap() - .audio() ->>>>>>> 48f0d38 (Replace State tokio::sync::Mutex by std::sync::RwLock) + .audio_output() .decode_packet_payload(VoiceStreamType::UDP, session_id, payload); } } -- cgit v1.2.1 From 7c5f60f210bfd05ea22d3a65f04e245989fdaade Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Tue, 6 Apr 2021 15:18:55 -0300 Subject: Resolved merge upstream conflicts --- 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 11a3f27..3ca77af 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 From ab649ca21286baf182c18d11450bf58d25af0c84 Mon Sep 17 00:00:00 2001 From: Rubens Brandao Date: Sat, 10 Apr 2021 07:39:46 -0300 Subject: Ops, forgot to fix upstream conflicts --- mumd/src/network/udp.rs | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mumd/src/network/udp.rs') diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index 086e072..3ca77af 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -33,11 +33,7 @@ pub async fn handle( mut connection_info_receiver: watch::Receiver>, mut crypt_state_receiver: mpsc::Receiver, ) -> Result<(), UdpError> { -<<<<<<< HEAD let receiver = state.read().unwrap().audio_input().receiver(); -======= - let receiver = state.read().unwrap().audio().input_receiver(); ->>>>>>> main loop { let connection_info = 'data: loop { @@ -155,11 +151,7 @@ async fn listen( state .read() .unwrap() -<<<<<<< HEAD .audio_output() -======= - .audio() ->>>>>>> main .decode_packet_payload(VoiceStreamType::UDP, session_id, payload); } } -- cgit v1.2.1