From 48ce14064d355ad0ed89e59b1d4b10256c85be6a Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Fri, 25 Dec 2020 15:24:19 +0100 Subject: initial tokio 1.0 commit --- mumd/src/network/udp.rs | 60 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 21 deletions(-) (limited to 'mumd/src/network/udp.rs') diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index b1c202a..55a47a3 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -29,16 +29,22 @@ pub async fn handle( let mut receiver = state.lock().unwrap().audio_mut().take_receiver().unwrap(); loop { - let connection_info = loop { - match connection_info_receiver.recv().await { - None => { - return; - } - Some(None) => {} - Some(Some(connection_info)) => { - break connection_info; + let connection_info = 'data: loop { + while let Ok(()) = connection_info_receiver.changed().await { + if let Some(data) = connection_info_receiver.borrow().clone() { + break 'data data; } } + return; + // match connection_info_receiver.recv().await { + // None => { + // return; + // } + // Some(None) => {} + // Some(Some(connection_info)) => { + // break connection_info; + // } + // } }; let (mut sink, source) = connect(&mut crypt_state_receiver).await; @@ -114,10 +120,16 @@ async fn listen( ) { let (tx, rx) = oneshot::channel(); let phase_transition_block = async { - while !matches!( - phase_watcher.recv().await.unwrap(), - StatePhase::Disconnected - ) {} + loop { + phase_watcher.changed().await.unwrap(); + if matches!(*phase_watcher.borrow(), StatePhase::Disconnected) { + break; + } + } + // while !matches!( + // phase_watcher.recv().await.unwrap(), + // StatePhase::Disconnected + // ) {} tx.send(true).unwrap(); }; @@ -203,10 +215,16 @@ async fn send_voice( ) { let (tx, rx) = oneshot::channel(); let phase_transition_block = async { - while !matches!( - phase_watcher.recv().await.unwrap(), - StatePhase::Disconnected - ) {} + loop { + phase_watcher.changed().await.unwrap(); + if matches!(*phase_watcher.borrow(), StatePhase::Disconnected) { + break; + } + } + // while !matches!( + // phase_watcher.recv().await.unwrap(), + // StatePhase::Disconnected + // ) {} tx.send(true).unwrap(); }; @@ -261,11 +279,11 @@ pub async fn handle_pings( Box, )>, ) { - let udp_socket = UdpSocket::bind((Ipv6Addr::from(0u128), 0u16)) + let udp_socket = Arc::new(UdpSocket::bind((Ipv6Addr::from(0u128), 0u16)) .await - .expect("Failed to bind UDP socket"); + .expect("Failed to bind UDP socket")); - let (mut receiver, mut sender) = udp_socket.split(); + // let (mut receiver, mut sender) = udp_socket.split(); let pending = Rc::new(Mutex::new(HashMap::new())); @@ -273,14 +291,14 @@ pub async fn handle_pings( while let Some((id, socket_addr, handle)) = ping_request_receiver.recv().await { let packet = PingPacket { id }; let packet: [u8; 12] = packet.into(); - sender.send_to(&packet, &socket_addr).await.unwrap(); + udp_socket.send_to(&packet, &socket_addr).await.unwrap(); pending.lock().unwrap().insert(id, handle); } }; let receiver_handle = async { let mut buf = vec![0; 24]; - while let Ok(read) = receiver.recv(&mut buf).await { + while let Ok(read) = udp_socket.recv(&mut buf).await { assert_eq!(read, 24); let packet = PongPacket::try_from(buf.as_slice()).unwrap(); -- cgit v1.2.1 From 01e0cecb52ed6f33ca2003441646afb538304c89 Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Fri, 25 Dec 2020 22:10:52 +0100 Subject: remove dead code --- mumd/src/network/udp.rs | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'mumd/src/network/udp.rs') diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index 55a47a3..d3ca1c9 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -36,15 +36,6 @@ pub async fn handle( } } return; - // match connection_info_receiver.recv().await { - // None => { - // return; - // } - // Some(None) => {} - // Some(Some(connection_info)) => { - // break connection_info; - // } - // } }; let (mut sink, source) = connect(&mut crypt_state_receiver).await; @@ -126,10 +117,6 @@ async fn listen( break; } } - // while !matches!( - // phase_watcher.recv().await.unwrap(), - // StatePhase::Disconnected - // ) {} tx.send(true).unwrap(); }; @@ -221,10 +208,6 @@ async fn send_voice( break; } } - // while !matches!( - // phase_watcher.recv().await.unwrap(), - // StatePhase::Disconnected - // ) {} tx.send(true).unwrap(); }; @@ -279,11 +262,9 @@ pub async fn handle_pings( Box, )>, ) { - let udp_socket = Arc::new(UdpSocket::bind((Ipv6Addr::from(0u128), 0u16)) + let udp_socket = UdpSocket::bind((Ipv6Addr::from(0u128), 0u16)) .await - .expect("Failed to bind UDP socket")); - - // let (mut receiver, mut sender) = udp_socket.split(); + .expect("Failed to bind UDP socket"); let pending = Rc::new(Mutex::new(HashMap::new())); -- cgit v1.2.1 From 8335bd3b6ca5b87f23aa191722e04fe1c78acc79 Mon Sep 17 00:00:00 2001 From: Eskil Q Date: Sat, 26 Dec 2020 07:46:37 +0100 Subject: minor code cleanup --- 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 d3ca1c9..b592a60 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -30,7 +30,7 @@ pub async fn handle( loop { let connection_info = 'data: loop { - while let Ok(()) = connection_info_receiver.changed().await { + while connection_info_receiver.changed().await.is_ok() { if let Some(data) = connection_info_receiver.borrow().clone() { break 'data data; } -- cgit v1.2.1