Skip to content

Commit 922d0df

Browse files
added some debug
1 parent 3c39a7e commit 922d0df

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

src/handlers/client_handler.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
2626
stream.readable().await?;
2727

2828
match stream.try_read(&mut temp_buf) {
29-
Ok(0) => break, // if client disconnected
29+
Ok(0) => {
30+
debug!("No more data to read. Exiting...");
31+
break; // if client disconnected
32+
}
3033
Ok(n) => {
3134
buffer.put_slice(&temp_buf[..n]);
3235

@@ -51,17 +54,19 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
5154
ping::handle_and_send(&mut stream, &mut buffer).await?
5255
}
5356
NextStateEnum::Login => {
57+
debug!("Received encryption response");
5458
encryption_response::handle(session, &mut buffer, keys.clone())?;
5559

5660
let player_data = mojang::join(session, keys.clone()).await?;
5761
if player_data.is_none() {
62+
debug!("Mojang error");
5863
disconnect::send(
5964
&mut stream,
6065
session,
6166
config.messages.bad_session.clone(),
6267
)
6368
.await?;
64-
break;
69+
return Ok(());
6570
}
6671
let player_data = player_data.unwrap();
6772
let map = get_map().await;
@@ -89,11 +94,11 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
8994
.await?;
9095

9196
info!("Created code {} for {}", code, player_data.name);
92-
break;
97+
return Ok(());
9398
}
94-
NextStateEnum::Unknown => break,
99+
NextStateEnum::Unknown => return Ok(()),
95100
},
96-
_ => break,
101+
_ => return Ok(()),
97102
}
98103
}
99104
}

src/responses/disconnect.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use anyhow::Result;
22
use tokio::{io::AsyncWriteExt, net::TcpStream};
3+
use tracing::debug;
34

45
use crate::{
56
client_sessions::Session, encryption::encrypt_packet, packets::disconnect::DisconnectPacket,
@@ -16,5 +17,7 @@ pub async fn send(stream: &mut TcpStream, session: &mut Session, reason: String)
1617
stream.writable().await?;
1718
stream.write_all(&disconnect_packet).await?;
1819
stream.shutdown().await?;
20+
21+
debug!("Disconnected client with reason: {}", reason);
1922
Ok(())
2023
}

0 commit comments

Comments
 (0)