From d8b558055af358dfce92a3abcba272785bbd3372 Mon Sep 17 00:00:00 2001 From: Wiktor Mazur Date: Sun, 4 Aug 2019 19:20:41 +0200 Subject: [PATCH] packet decoding and game message encoding --- lib/protocol16/src/lib.rs | 4 +++- lib/protocol16/src/types.rs | 8 ++++--- src/game_protocol/message.rs | 35 +++++++++++++++++++++++++++++ src/game_protocol/mod.rs | 6 +++++ src/game_protocol/packet.rs | 6 +++++ src/{ => game_protocol}/protocol.rs | 34 +++++++++++++++++++++++----- src/main.rs | 10 +++++++-- 7 files changed, 91 insertions(+), 12 deletions(-) create mode 100644 src/game_protocol/message.rs create mode 100644 src/game_protocol/mod.rs create mode 100644 src/game_protocol/packet.rs rename src/{ => game_protocol}/protocol.rs (62%) diff --git a/lib/protocol16/src/lib.rs b/lib/protocol16/src/lib.rs index 4fc68ff..4910c32 100644 --- a/lib/protocol16/src/lib.rs +++ b/lib/protocol16/src/lib.rs @@ -10,7 +10,9 @@ mod types; use std::io::Read; use types::TypeCode; -use types::Value; + +pub use types::Parameters; +pub use types::Value; pub fn deserialize_boolean(buf: &mut Cursor<&[u8]>) -> Option { Some(buf.get_u8() != 0) diff --git a/lib/protocol16/src/types.rs b/lib/protocol16/src/types.rs index 252f7cf..8cbcb57 100644 --- a/lib/protocol16/src/types.rs +++ b/lib/protocol16/src/types.rs @@ -1,5 +1,7 @@ use std::collections::HashMap; +pub type Parameters = HashMap; + pub enum TypeCode { Unknown = 0, Null = 42, @@ -52,7 +54,7 @@ impl From for TypeCode { #[derive(Clone, Debug, PartialEq)] pub struct EventData { pub code: u8, - pub parameters: HashMap + pub parameters: Parameters } #[derive(Clone, Debug, PartialEq)] @@ -60,13 +62,13 @@ pub struct OperationResponse { pub code: u8, pub return_code: i16, pub debug_message: String, - pub parameters: HashMap + pub parameters: Parameters } #[derive(Clone, Debug, PartialEq)] pub struct OperationRequest { pub code: u8, - pub parameters: HashMap + pub parameters: Parameters } diff --git a/src/game_protocol/message.rs b/src/game_protocol/message.rs new file mode 100644 index 0000000..92e552a --- /dev/null +++ b/src/game_protocol/message.rs @@ -0,0 +1,35 @@ +use protocol16::Parameters; +use protocol16::Value; +use super::packet::Packet; + +#[derive(Debug)] +pub struct ChatSay { + pub source: usize, + pub source_name: String, + pub text: String +} + +impl ChatSay { + fn encode(val: Parameters) -> Option { + println!("Encoded ChatSay"); + let source = if let Value::Short(v) = val.get(&0)? { *v as usize } else { return None }; + let source_name = if let Value::String(v) = val.get(&1)? { v.clone() } else { return None }; + let text = if let Value::String(v) = val.get(&2)? { v.clone() } else { return None }; + + Some(Message::ChatSay(Self {source, source_name, text})) + } +} + +pub enum Message { + ChatSay(ChatSay) +} + +impl Packet { + pub fn decode(self) -> Option { + // println!("Encoded ChatSay? {}", &self.code); + match self.code { + 63 => ChatSay::encode(self.parameters), + _ => None + } + } +} \ No newline at end of file diff --git a/src/game_protocol/mod.rs b/src/game_protocol/mod.rs new file mode 100644 index 0000000..cd69238 --- /dev/null +++ b/src/game_protocol/mod.rs @@ -0,0 +1,6 @@ +mod protocol; +mod message; +mod packet; + +pub use protocol::decode; +pub use message::Message; \ No newline at end of file diff --git a/src/game_protocol/packet.rs b/src/game_protocol/packet.rs new file mode 100644 index 0000000..b473cb7 --- /dev/null +++ b/src/game_protocol/packet.rs @@ -0,0 +1,6 @@ +use protocol16::Parameters; + +pub struct Packet { + pub code: usize, + pub parameters: Parameters +} \ No newline at end of file diff --git a/src/protocol.rs b/src/game_protocol/protocol.rs similarity index 62% rename from src/protocol.rs rename to src/game_protocol/protocol.rs index 218e3de..d289b0c 100644 --- a/src/protocol.rs +++ b/src/game_protocol/protocol.rs @@ -12,9 +12,13 @@ static MSG_TYPE_REQUEST: u8 = 2; static MSG_TYPE_RESPONSE: u8 = 3; static MSG_TYPE_EVENT: u8 = 4; +use super::message::Message; +use super::packet::Packet; -pub fn decode(payload: &[u8]) +pub fn decode(payload: &[u8]) -> Vec { + let mut messages = vec![]; + let mut cursor = Cursor::new(payload); cursor.advance(3); @@ -31,16 +35,25 @@ pub fn decode(payload: &[u8]) break; } else if cmd_type == SEND_UNRELIABLE { cursor.advance(4); - on_message(&mut cursor, cmd_length - 4); + if let Some(msg) = on_message(&mut cursor, cmd_length - 4) { + messages.push(msg); + } } else if cmd_type == SEND_RELIABLE { - on_message(&mut cursor, cmd_length); + if let Some(msg) = on_message(&mut cursor, cmd_length) { + messages.push(msg); + } + } else { cursor.advance((cmd_length - CMD_HEADER_LENGTH) as usize); } } + + messages } -fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) { +fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { + let mut message = None; + let init = cursor.bytes().len(); cursor.advance(SIGNIFIER_BYTE_LENGTH); @@ -51,13 +64,22 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) { if msg_type == MSG_TYPE_EVENT { if let Some(event_data) = protocol16::deserialize_event_data(&mut payload) { - if event_data.code != 2 { - println!("{:?}", event_data); + if event_data.code != 2 && event_data.parameters.get(&252u8).is_some() { + if let protocol16::Value::Short(code) = event_data.parameters.get(&252u8)? { + let packet = Packet{code: *code as usize, parameters: event_data.parameters}; + message = packet.decode() + } } } + } else if msg_type == MSG_TYPE_REQUEST { + + } else if msg_type == MSG_TYPE_RESPONSE { + } cursor.advance(operation_length as usize); let last = cursor.bytes().len(); assert!(init - last == msg_len as usize - CMD_HEADER_LENGTH as usize); + + message } \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 48c2044..e330d2b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,7 +9,7 @@ use std::sync::mpsc; use packet_sniffer::UdpPacket; -mod protocol; +mod game_protocol; fn main() { let (tx, rx): (Sender, Receiver) = mpsc::channel(); @@ -21,7 +21,13 @@ fn main() { if packet.destination_port != 5056 && packet.source_port != 5056 { continue; } - protocol::decode(&packet.payload); + let messages = game_protocol::decode(&packet.payload); + + for msg in messages { + if let game_protocol::Message::ChatSay(m) = msg { + println!("Found message {:?}", m); + } + } }