tribufu/rust-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/rust-gamedig synced 2026-06-01 09:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Protocol] Valve: change up compressed packages structure to use Options

Browse source
This commit is contained in:
CosminPerRam 2023-09-06 13:46:52 +03:00
parent 7cfecbfff9
commit 527f8f6369
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/protocols/valve/protocol.rs
View file

@ -41,9 +41,9 @@ struct SplitPacket {
pub total: u8, pub total: u8,
pub number: u8, pub number: u8,
pub size: u16, pub size: u16,
pub compressed: bool, /// None means its not compressed, Some means it is and it contains
pub decompressed_size: Option<u32>, /// (decompressed_size and decompressed_crc32)
pub uncompressed_crc32: Option<u32>, pub compressed: Option<(u32, u32)>,
payload: Vec<u8>, payload: Vec<u8>,
} }
@ -51,10 +51,10 @@ impl SplitPacket {
fn new(engine: &Engine, protocol: u8, buffer: &mut Buffer<LittleEndian>) -> GDResult<Self> { fn new(engine: &Engine, protocol: u8, buffer: &mut Buffer<LittleEndian>) -> GDResult<Self> {
let header = buffer.read()?; //buffer.get_u32()?; let header = buffer.read()?; //buffer.get_u32()?;
let id = buffer.read()?; let id = buffer.read()?;
let (total, number, size, compressed, decompressed_size, uncompressed_crc32) = match engine { let (total, number, size, compressed) = match engine {
Engine::GoldSrc(_) => { Engine::GoldSrc(_) => {
let (lower, upper) = u8_lower_upper(buffer.read()?); let (lower, upper) = u8_lower_upper(buffer.read()?);
(lower, upper, 0, false, None, None) (lower, upper, 0, None)
} }
Engine::Source(_) => { Engine::Source(_) => {
let total = buffer.read()?; let total = buffer.read()?;
@ -64,20 +64,14 @@ impl SplitPacket {
false => buffer.read()?, false => buffer.read()?,
true => 1248, true => 1248,
}; };
let compressed = ((id >> 31) & 1u32) == 1u32;
let (decompressed_size, uncompressed_crc32) = match compressed { let is_compressed = ((id >> 31) & 1u32) == 1u32;
false => (None, None), let compressed = match is_compressed {
true => (Some(buffer.read()?), Some(buffer.read()?)), false => None,
true => Some((buffer.read()?, buffer.read()?)),
}; };
(
total, (total, number, size, compressed)
number,
size,
compressed,
decompressed_size,
uncompressed_crc32,
)
} }
}; };
@ -88,20 +82,18 @@ impl SplitPacket {
number, number,
size, size,
compressed, compressed,
decompressed_size,
uncompressed_crc32,
payload: buffer.remaining_bytes().to_vec(), payload: buffer.remaining_bytes().to_vec(),
}) })
} }
fn get_payload(&self) -> GDResult<Vec<u8>> { fn get_payload(&self) -> GDResult<Vec<u8>> {
if self.compressed { if let Some(decompressed) = self.compressed {
let mut decoder = Decoder::new(); let mut decoder = Decoder::new();
decoder decoder
.write(&self.payload) .write(&self.payload)
.map_err(|e| Decompress.context(e))?; .map_err(|e| Decompress.context(e))?;
let decompressed_size = self.decompressed_size.unwrap() as usize; let decompressed_size = decompressed.0 as usize;
let mut decompressed_payload = vec![0; decompressed_size]; let mut decompressed_payload = vec![0; decompressed_size];
@ -110,7 +102,7 @@ impl SplitPacket {
.map_err(|e| Decompress.context(e))?; .map_err(|e| Decompress.context(e))?;
if decompressed_payload.len() != decompressed_size if decompressed_payload.len() != decompressed_size
|| crc32fast::hash(&decompressed_payload) != self.uncompressed_crc32.unwrap() || crc32fast::hash(&decompressed_payload) != decompressed.1
{ {
Err(Decompress.context(format!( Err(Decompress.context(format!(
"Decompressed size {} was not expected {}", "Decompressed size {} was not expected {}",