aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network.rs
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2020-10-12 02:26:10 +0200
committerEskil Queseth <eskilq@kth.se>2020-10-12 02:26:10 +0200
commit5fd253ac080cfe098a8236d9daf0fc69cbdb5bed (patch)
treee37390fed55fa107aa2464cff90ce3a169b4efdd /mumd/src/network.rs
parentdec60d11b81a7dbef9286ac72be36ebaec95543a (diff)
downloadmum-5fd253ac080cfe098a8236d9daf0fc69cbdb5bed.tar.gz
Cleaned up inports in network.rs
Diffstat (limited to 'mumd/src/network.rs')
-rw-r--r--mumd/src/network.rs30
1 files changed, 9 insertions, 21 deletions
diff --git a/mumd/src/network.rs b/mumd/src/network.rs
index cd36f21..0602860 100644
--- a/mumd/src/network.rs
+++ b/mumd/src/network.rs
@@ -3,31 +3,19 @@ use crate::state::Server;
use bytes::Bytes;
use futures::channel::oneshot;
-use futures::join;
-use futures::SinkExt;
-use futures::StreamExt;
+use futures::{join, SinkExt, StreamExt};
use futures_util::stream::{SplitSink, SplitStream};
-use mumble_protocol::control::msgs;
-use mumble_protocol::control::ClientControlCodec;
-use mumble_protocol::control::ControlCodec;
-use mumble_protocol::control::ControlPacket;
+use mumble_protocol::control::{msgs, ClientControlCodec, ControlCodec, ControlPacket};
use mumble_protocol::crypt::ClientCryptState;
-use mumble_protocol::voice::VoicePacket;
-use mumble_protocol::voice::VoicePacketPayload;
+use mumble_protocol::voice::{VoicePacket, VoicePacketPayload};
use mumble_protocol::{Clientbound, Serverbound};
-use std::convert::Into;
-use std::convert::TryInto;
-use std::net::Ipv6Addr;
-use std::net::SocketAddr;
-use std::sync::Arc;
-use std::sync::Mutex;
-use tokio::net::TcpStream;
-use tokio::net::UdpSocket;
+use std::convert::{Into, TryInto};
+use std::net::{Ipv6Addr, SocketAddr};
+use std::sync::{Arc, Mutex};
+use tokio::net::{TcpStream, UdpSocket};
use tokio::time::{self, Duration};
-use tokio_tls::TlsConnector;
-use tokio_tls::TlsStream;
-use tokio_util::codec::Decoder;
-use tokio_util::codec::Framed;
+use tokio_tls::{TlsConnector, TlsStream};
+use tokio_util::codec::{Decoder, Framed};
use tokio_util::udp::UdpFramed;
type TcpSender = SplitSink<