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] Remove bufferer::data_length function and replace its usage

Browse source
This commit is contained in:
CosminPerRam 2023-06-27 00:17:33 +03:00
parent c55254aaf6
commit d61085b1ab
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bufferer.rs
View file

@ -164,13 +164,11 @@ impl Bufferer {
pub fn move_position_backward(&mut self, by: usize) { self.position -= by; } pub fn move_position_backward(&mut self, by: usize) { self.position -= by; }
pub fn data_length(&self) -> usize { self.data.len() }
pub fn remaining_data(&self) -> &[u8] { &self.data[self.position ..] } pub fn remaining_data(&self) -> &[u8] { &self.data[self.position ..] }
pub fn remaining_data_vec(&self) -> Vec<u8> { self.remaining_data().to_vec() } pub fn remaining_data_vec(&self) -> Vec<u8> { self.remaining_data().to_vec() }
pub fn remaining_length(&self) -> usize { self.data_length() - self.position } pub fn remaining_length(&self) -> usize { self.data.len() - self.position }
pub fn is_remaining_empty(&self) -> bool { self.remaining_length() == 0 } pub fn is_remaining_empty(&self) -> bool { self.remaining_length() == 0 }

5
src/protocols/minecraft/protocol/legacy_bv1_8.rs
View file

@ -28,14 +28,15 @@ impl LegacyBV1_8 {
fn get_info(&mut self) -> GDResult<JavaResponse> { fn get_info(&mut self) -> GDResult<JavaResponse> {
self.send_initial_request()?; self.send_initial_request()?;
let mut buffer = Bufferer::new_with_data(Endianess::Big, &self.socket.receive(None)?); let data = self.socket.receive(None)?;
let mut buffer = Bufferer::new_with_data(Endianess::Big, &data);
if buffer.get_u8()? != 0xFF { if buffer.get_u8()? != 0xFF {
return Err(ProtocolFormat); return Err(ProtocolFormat);
} }
let length = buffer.get_u16()? * 2; let length = buffer.get_u16()? * 2;
error_by_expected_size((length + 3) as usize, buffer.data_length())?; error_by_expected_size((length + 3) as usize, data.len())?;
let packet_string = buffer.get_string_utf16()?; let packet_string = buffer.get_string_utf16()?;

5
src/protocols/minecraft/protocol/legacy_v1_4.rs
View file

@ -28,14 +28,15 @@ impl LegacyV1_4 {
fn get_info(&mut self) -> GDResult<JavaResponse> { fn get_info(&mut self) -> GDResult<JavaResponse> {
self.send_initial_request()?; self.send_initial_request()?;
let mut buffer = Bufferer::new_with_data(Endianess::Big, &self.socket.receive(None)?); let data = self.socket.receive(None)?;
let mut buffer = Bufferer::new_with_data(Endianess::Big, &data);
if buffer.get_u8()? != 0xFF { if buffer.get_u8()? != 0xFF {
return Err(ProtocolFormat); return Err(ProtocolFormat);
} }
let length = buffer.get_u16()? * 2; let length = buffer.get_u16()? * 2;
error_by_expected_size((length + 3) as usize, buffer.data_length())?; error_by_expected_size((length + 3) as usize, data.len())?;
if LegacyV1_6::is_protocol(&mut buffer)? { if LegacyV1_6::is_protocol(&mut buffer)? {
return LegacyV1_6::get_response(&mut buffer); return LegacyV1_6::get_response(&mut buffer);

5
src/protocols/minecraft/protocol/legacy_v1_6.rs
View file

@ -77,14 +77,15 @@ impl LegacyV1_6 {
fn get_info(&mut self) -> GDResult<JavaResponse> { fn get_info(&mut self) -> GDResult<JavaResponse> {
self.send_initial_request()?; self.send_initial_request()?;
let mut buffer = Bufferer::new_with_data(Endianess::Big, &self.socket.receive(None)?); let data = self.socket.receive(None)?;
let mut buffer = Bufferer::new_with_data(Endianess::Big, &data);
if buffer.get_u8()? != 0xFF { if buffer.get_u8()? != 0xFF {
return Err(ProtocolFormat); return Err(ProtocolFormat);
} }
let length = buffer.get_u16()? * 2; let length = buffer.get_u16()? * 2;
error_by_expected_size((length + 3) as usize, buffer.data_length())?; error_by_expected_size((length + 3) as usize, data.len())?;
if !LegacyV1_6::is_protocol(&mut buffer)? { if !LegacyV1_6::is_protocol(&mut buffer)? {
return Err(ProtocolFormat); return Err(ProtocolFormat);