From 5af72d30bb1b34cbde1c3ba5e73b7c694461ae51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 29 Mar 2021 21:38:12 +0200 Subject: report invalid server password --- mumd/src/network/tcp.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'mumd/src/network/tcp.rs') diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index 1738b15..29749f1 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -8,6 +8,7 @@ use mumble_protocol::control::{msgs, ClientControlCodec, ControlCodec, ControlPa use mumble_protocol::crypt::ClientCryptState; use mumble_protocol::voice::VoicePacket; use mumble_protocol::{Clientbound, Serverbound}; +use mumlib::error::Error; use std::collections::HashMap; use std::convert::{Into, TryInto}; use std::net::SocketAddr; @@ -38,7 +39,7 @@ pub enum TcpEvent { #[derive(Clone)] pub enum TcpEventData<'a> { - Connected(Result<&'a msgs::ServerSync, mumlib::error::Error>), + Connected(Result<&'a msgs::ServerSync, Error>), _Disconnected, } @@ -300,7 +301,14 @@ async fn listen( state.initialized(); } ControlPacket::Reject(msg) => { - warn!("Login rejected: {:?}", msg); + match msg.get_field_type() { + msgs::Reject_RejectType::WrongServerPW => { + event_queue.send(TcpEventData::Connected(Err(Error::InvalidServerPassword))).await; + } + _ => { + warn!("Login rejected: {:?}", msg); + } + } } ControlPacket::UserState(msg) => { state.lock().await.parse_user_state(*msg); -- cgit v1.2.1