KA-DEVS/mcquery-rs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Change gen_session_id to mcstatus' implementation

Browse Source 
See 1aef08b293/mcstatus/querier.py (L21)
This commit is contained in:
Elias Schriefer 2021-09-17 18:18:11 +02:00
parent c39742a44f
commit 25ae6adda9
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -8,6 +8,9 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
rand = "^0.8"
[dependencies.tokio] [dependencies.tokio]
version = "^1.0" version = "^1.0"
features = ["net", "time"] features = ["net", "time"]

8
src/lib.rs
View File

@ -44,15 +44,9 @@ use tokio::{
pub const SESSION_ID_MASK: u32 = 0x0F0F0F0F; pub const SESSION_ID_MASK: u32 = 0x0F0F0F0F;
const REQUEST_HEADER: [u8; 2] = [0xFE, 0xFD]; const REQUEST_HEADER: [u8; 2] = [0xFE, 0xFD];
static mut SESSION_ID_COUNTER: u16 = 0;
fn gen_session_id() -> u32 { fn gen_session_id() -> u32 {
unsafe {
SESSION_ID_COUNTER = SESSION_ID_COUNTER.wrapping_add(1);
}
let mut session_id_bytes = [0; 4]; let mut session_id_bytes = [0; 4];
for (i, b) in unsafe { SESSION_ID_COUNTER }.to_be_bytes().iter().enumerate() { for (i, b) in rand::random::<u16>().to_be_bytes().iter().enumerate() {
session_id_bytes[i * 2] = b >> 4; session_id_bytes[i * 2] = b >> 4;
session_id_bytes[i * 2 + 1] = b & 0x0F; session_id_bytes[i * 2 + 1] = b & 0x0F;
} }