Skip to content

Commit 11f86c4

Browse files
fix: Fixed address panic
1 parent 5af9bb3 commit 11f86c4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mc-oauth"
3-
version = "0.1.6"
3+
version = "0.1.7"
44
edition = "2021"
55

66
[dependencies]

src/client.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use aes::Aes128;
1717
use anyhow::{anyhow, Result};
1818
use bytes::{BufMut, BytesMut};
1919
use cfb8::Encryptor;
20-
use std::{sync::Arc, time::Duration};
20+
use std::{net::SocketAddr, sync::Arc, time::Duration};
2121
use tokio::net::TcpStream;
2222
use tracing::{debug, error, info};
2323
use uuid::Uuid;
@@ -39,10 +39,11 @@ pub struct Session {
3939
pub secret: Option<Vec<u8>>, // Shared secret,
4040
pub verify_token: [u8; 4],
4141
pub cipher: Option<Encryptor<Aes128>>,
42+
pub addr: SocketAddr,
4243
}
4344

4445
impl Session {
45-
pub async fn new() -> Self {
46+
pub async fn new(addr: SocketAddr) -> Self {
4647
let config = get_config().await;
4748

4849
Self {
@@ -54,6 +55,7 @@ impl Session {
5455
secret: None,
5556
verify_token: generate_verify_token(),
5657
cipher: None,
58+
addr,
5759
}
5860
}
5961
}
@@ -69,7 +71,7 @@ pub struct MinecraftClient {
6971
impl MinecraftClient {
7072
pub async fn new(stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Self {
7173
Self {
72-
session: Session::new().await,
74+
session: Session::new(stream.peer_addr().unwrap()).await,
7375
buffer: BytesMut::new(),
7476
config: get_config().await,
7577
stream,
@@ -81,7 +83,7 @@ impl MinecraftClient {
8183
match self._run().await {
8284
Ok(_) => info!(
8385
"Connection from {:?} closed successfully",
84-
self.stream.peer_addr().unwrap()
86+
self.session.addr
8587
),
8688
Err(e) => error!("Internal error occurred: {}", e),
8789
}

0 commit comments

Comments
 (0)