diff --git a/src/game_protocol/protocol.rs b/src/game_protocol/protocol.rs index 9505d09..d8c6f86 100644 --- a/src/game_protocol/protocol.rs +++ b/src/game_protocol/protocol.rs @@ -20,20 +20,20 @@ static MSG_TYPE_EVENT: u8 = 4; use super::message::Message; use super::packet::Packet; -pub fn decode(payload: &[u8]) -> Vec +pub fn decode(payload: &[u8]) -> Option> { let mut messages = vec![]; let mut cursor = Cursor::new(payload); cursor.advance(3); - let cmd_cnt = photon_protocol::deserialize_byte(&mut cursor).unwrap(); + let cmd_cnt = photon_protocol::deserialize_byte(&mut cursor)?; cursor.advance(8); for _ in 0..cmd_cnt { - let cmd_type = photon_protocol::deserialize_byte(&mut cursor).unwrap(); + let cmd_type = photon_protocol::deserialize_byte(&mut cursor)?; cursor.advance(3); - let cmd_length = photon_protocol::deserialize_integer(&mut cursor).unwrap(); + let cmd_length = photon_protocol::deserialize_integer(&mut cursor)?; cursor.advance(4); if cmd_type == LOG_OUT { @@ -53,7 +53,7 @@ pub fn decode(payload: &[u8]) -> Vec } } - messages + Some(messages) } fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { @@ -62,7 +62,7 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { let init = cursor.bytes().len(); cursor.advance(SIGNIFIER_BYTE_LENGTH); - let msg_type = photon_protocol::deserialize_byte(cursor).unwrap(); + let msg_type = photon_protocol::deserialize_byte(cursor)?; let operation_length = msg_len - CMD_HEADER_LENGTH - 2; let mut payload = Cursor::new(&cursor.bytes()[0..operation_length as usize]); diff --git a/src/lib.rs b/src/lib.rs index 38407f4..3ac01e3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -116,7 +116,9 @@ fn initialize(_py: Python) -> PyResult { continue; } let meter = &mut METER.lock().unwrap(); - register_messages(meter, &game_protocol::decode(&packet.payload)); + if let Some(messages) = game_protocol::decode(&packet.payload) { + register_messages(meter, &messages); + } } } });