diff options
| -rw-r--r-- | mumd/src/network/tcp.rs | 17 | ||||
| -rw-r--r-- | mumd/src/network/udp.rs | 23 |
2 files changed, 2 insertions, 38 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index f79655a..c1d7a54 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -19,7 +19,6 @@ use tokio::sync::{mpsc, oneshot, watch}; use tokio::time::{self, Duration}; use tokio_native_tls::{TlsConnector, TlsStream}; use tokio_util::codec::{Decoder, Framed}; -// use tokio_util::codec::decoder::Decoder; type TcpSender = SplitSink< Framed<TlsStream<TcpStream>, ControlCodec<Serverbound, Clientbound>>, @@ -56,15 +55,6 @@ pub async fn handle( } } return; - // match connection_info_receiver.changed().await { - // None => { - // return; - // } - // Some(None) => {} - // Some(Some(connection_info)) => { - // break connection_info; - // } - // } }; let (mut sink, stream) = connect( connection_info.socket_addr, @@ -171,9 +161,6 @@ async fn send_packets( sink.borrow_mut().send(packet).await.unwrap(); }, || async { - //clears queue of remaining packets - // while packet_receiver.borrow_mut().try_recv().is_ok() {} - sink.borrow_mut().close().await.unwrap(); }, phase_watcher, @@ -336,10 +323,6 @@ async fn run_until_disconnection<T, F, G, H>( break; } } - // while !matches!( - // phase_watcher.recv().await.unwrap(), - // StatePhase::Disconnected - // ) {} tx.send(true).unwrap(); }; 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<dyn FnOnce(PongPacket)>, )>, ) { - 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())); |