packet decoding and game message encoding

This commit is contained in:
Wiktor Mazur
2019-08-04 19:20:41 +02:00
parent 6b7d1e2905
commit d8b558055a
7 changed files with 91 additions and 12 deletions
+3 -1
View File
@@ -10,7 +10,9 @@ mod types;
use std::io::Read; use std::io::Read;
use types::TypeCode; use types::TypeCode;
use types::Value;
pub use types::Parameters;
pub use types::Value;
pub fn deserialize_boolean(buf: &mut Cursor<&[u8]>) -> Option<bool> { pub fn deserialize_boolean(buf: &mut Cursor<&[u8]>) -> Option<bool> {
Some(buf.get_u8() != 0) Some(buf.get_u8() != 0)
+5 -3
View File
@@ -1,5 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
pub type Parameters = HashMap<u8, Value>;
pub enum TypeCode { pub enum TypeCode {
Unknown = 0, Unknown = 0,
Null = 42, Null = 42,
@@ -52,7 +54,7 @@ impl From<u8> for TypeCode {
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct EventData { pub struct EventData {
pub code: u8, pub code: u8,
pub parameters: HashMap<u8, Value> pub parameters: Parameters
} }
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
@@ -60,13 +62,13 @@ pub struct OperationResponse {
pub code: u8, pub code: u8,
pub return_code: i16, pub return_code: i16,
pub debug_message: String, pub debug_message: String,
pub parameters: HashMap<u8, Value> pub parameters: Parameters
} }
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct OperationRequest { pub struct OperationRequest {
pub code: u8, pub code: u8,
pub parameters: HashMap<u8, Value> pub parameters: Parameters
} }
+35
View File
@@ -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<Message> {
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<Message> {
// println!("Encoded ChatSay? {}", &self.code);
match self.code {
63 => ChatSay::encode(self.parameters),
_ => None
}
}
}
+6
View File
@@ -0,0 +1,6 @@
mod protocol;
mod message;
mod packet;
pub use protocol::decode;
pub use message::Message;
+6
View File
@@ -0,0 +1,6 @@
use protocol16::Parameters;
pub struct Packet {
pub code: usize,
pub parameters: Parameters
}
@@ -12,9 +12,13 @@ static MSG_TYPE_REQUEST: u8 = 2;
static MSG_TYPE_RESPONSE: u8 = 3; static MSG_TYPE_RESPONSE: u8 = 3;
static MSG_TYPE_EVENT: u8 = 4; 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<Message>
{ {
let mut messages = vec![];
let mut cursor = Cursor::new(payload); let mut cursor = Cursor::new(payload);
cursor.advance(3); cursor.advance(3);
@@ -31,16 +35,25 @@ pub fn decode(payload: &[u8])
break; break;
} else if cmd_type == SEND_UNRELIABLE { } else if cmd_type == SEND_UNRELIABLE {
cursor.advance(4); 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 { } 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 { } else {
cursor.advance((cmd_length - CMD_HEADER_LENGTH) as usize); 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<Message> {
let mut message = None;
let init = cursor.bytes().len(); let init = cursor.bytes().len();
cursor.advance(SIGNIFIER_BYTE_LENGTH); 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 msg_type == MSG_TYPE_EVENT {
if let Some(event_data) = protocol16::deserialize_event_data(&mut payload) { if let Some(event_data) = protocol16::deserialize_event_data(&mut payload) {
if event_data.code != 2 { if event_data.code != 2 && event_data.parameters.get(&252u8).is_some() {
println!("{:?}", event_data); 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); cursor.advance(operation_length as usize);
let last = cursor.bytes().len(); let last = cursor.bytes().len();
assert!(init - last == msg_len as usize - CMD_HEADER_LENGTH as usize); assert!(init - last == msg_len as usize - CMD_HEADER_LENGTH as usize);
message
} }
+8 -2
View File
@@ -9,7 +9,7 @@ use std::sync::mpsc;
use packet_sniffer::UdpPacket; use packet_sniffer::UdpPacket;
mod protocol; mod game_protocol;
fn main() { fn main() {
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = mpsc::channel(); let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = mpsc::channel();
@@ -21,7 +21,13 @@ fn main() {
if packet.destination_port != 5056 && packet.source_port != 5056 { if packet.destination_port != 5056 && packet.source_port != 5056 {
continue; 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);
}
}
} }