diff options
| author | Kapten Z∅∅m <55669224+default-username-852@users.noreply.github.com> | 2020-12-24 06:53:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-24 06:53:03 +0100 |
| commit | c38ec422588c5b5f1f6701a698dff5eeff30f0f2 (patch) | |
| tree | 06a595181130a0062437624a04b40241d8adbe9e | |
| parent | 2902064db5c24ac30cb1a58fd44832b02ee478be (diff) | |
| parent | 4b00228e055438f2e369ab7bb8d18c7379af64b1 (diff) | |
| download | mum-c38ec422588c5b5f1f6701a698dff5eeff30f0f2.tar.gz | |
Merge pull request #33 from sornas/ping-cleanup
Make use of updated rust-mumble-protocol
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | mumd/Cargo.toml | 2 | ||||
| -rw-r--r-- | mumd/src/network/udp.rs | 5 |
3 files changed, 4 insertions, 7 deletions
@@ -786,9 +786,9 @@ dependencies = [ [[package]] name = "mumble-protocol" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb966bde3fc52998b9b74522e8aa22826823cc69cbf672893f79115195c76921" +checksum = "4954adf2418ebc052d723997cf3e090729132d59a795113db931aa5811e46542" dependencies = [ "byteorder", "bytes", diff --git a/mumd/Cargo.toml b/mumd/Cargo.toml index ba0f5a0..39b9d26 100644 --- a/mumd/Cargo.toml +++ b/mumd/Cargo.toml @@ -26,7 +26,7 @@ futures-util = "0.3" hound = "3.4" ipc-channel = "0.14" log = "0.4" -mumble-protocol = "0.3" +mumble-protocol = "0.3.1" native-tls = "0.2" openssl = { version = "0.10" } opus = "0.2" diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index b303f8c..b1c202a 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -283,10 +283,7 @@ pub async fn handle_pings( while let Ok(read) = receiver.recv(&mut buf).await { assert_eq!(read, 24); - let packet = match PongPacket::try_from(buf.as_slice()) { - Ok(v) => v, - Err(_) => panic!(), - }; + let packet = PongPacket::try_from(buf.as_slice()).unwrap(); if let Some(handler) = pending.lock().unwrap().remove(&packet.id) { handler(packet); |