All neccesary messages

This commit is contained in:
Wiktor Mazur
2019-08-05 21:54:40 +02:00
parent 7ae7f6e0b7
commit cc4aac6303
4 changed files with 61 additions and 7 deletions
+9 -3
View File
@@ -68,8 +68,10 @@ pub fn deserialize_string(buf: &mut Cursor<&[u8]>) -> Option<String> {
let size = buf.get_i16_be(); let size = buf.get_i16_be();
let mut local_buffer = vec![0; size as usize]; let mut local_buffer = vec![0; size as usize];
buf.read_exact(&mut local_buffer[..]).unwrap(); if let Ok(_) = buf.read_exact(&mut local_buffer[..]) {
Some(String::from_utf8(local_buffer).unwrap()) return Some(String::from_utf8(local_buffer).unwrap());
}
None
} }
pub fn deserialize_string_array(buf: &mut Cursor<&[u8]>) -> Option<Vec<String>> { pub fn deserialize_string_array(buf: &mut Cursor<&[u8]>) -> Option<Vec<String>> {
@@ -90,7 +92,11 @@ pub fn deserialize_byte_array(buf: &mut Cursor<&[u8]>) -> Option<Vec<u8>> {
let mut value = vec![]; let mut value = vec![];
for _ in 0..size { for _ in 0..size {
value.push(buf.get_u8()); if buf.remaining() > 0 {
value.push(buf.get_u8());
} else {
return None
}
} }
Some(value) Some(value)
+40
View File
@@ -153,12 +153,51 @@ impl RegenerationHealthChanged {
} }
} }
#[derive(Debug)]
pub struct CharacterStats {
pub source: usize,
pub character_name: String,
pub health: f32,
pub max_health: f32,
pub energy: f32,
pub max_energy: f32,
}
impl CharacterStats {
fn encode(val: Parameters) -> Option<Message> {
if val.len() < 40 {
return None;
}
let source = deserialize_number!(val, 0, "CharacterStats::source")?;
let character_name = deserialize_string!(val, 2, "CharacterStats::character_name")?;
let health = deserialize_float!(val, 11, "CharacterStats::health")?;
let max_health = deserialize_float!(val, 12, "CharacterStats::max_health")?;
let energy = deserialize_float!(val, 15, "CharacterStats::energy")?;
let max_energy = deserialize_float!(val, 16, "CharacterStats::max_energy")?;
Some(Message::CharacterStats(Self {
source,
character_name,
health,
max_health,
energy,
max_energy,
}))
}
}
#[derive(Debug)] #[derive(Debug)]
pub enum Message { pub enum Message {
ChatSay(ChatSay), ChatSay(ChatSay),
NewCharacter(NewCharacter), NewCharacter(NewCharacter),
HealthUpdate(HealthUpdate), HealthUpdate(HealthUpdate),
RegenerationHealthChanged(RegenerationHealthChanged), RegenerationHealthChanged(RegenerationHealthChanged),
CharacterStats(CharacterStats)
} }
impl Packet { impl Packet {
@@ -168,6 +207,7 @@ impl Packet {
24 => NewCharacter::encode(self.parameters), 24 => NewCharacter::encode(self.parameters),
63 => ChatSay::encode(self.parameters), 63 => ChatSay::encode(self.parameters),
79 => RegenerationHealthChanged::encode(self.parameters), 79 => RegenerationHealthChanged::encode(self.parameters),
1001 => CharacterStats::encode(self.parameters),
_ => None, _ => None,
} }
} }
+11 -3
View File
@@ -10,6 +10,8 @@ static LOG_OUT: u8 = 4;
static SEND_UNRELIABLE: u8 = 7; static SEND_UNRELIABLE: u8 = 7;
static SEND_RELIABLE: u8 = 6; static SEND_RELIABLE: u8 = 6;
static RESPONSE_CONSTANT: usize = 1000;
static MSG_TYPE_REQUEST: u8 = 2; 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;
@@ -69,15 +71,21 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
if event_data.code != 2 && event_data.parameters.get(&252u8).is_some() { if event_data.code != 2 && event_data.parameters.get(&252u8).is_some() {
if let protocol16::Value::Short(code) = event_data.parameters.get(&252u8)? { if let protocol16::Value::Short(code) = event_data.parameters.get(&252u8)? {
let packet = Packet{code: *code as usize, parameters: event_data.parameters}; let packet = Packet{code: *code as usize, parameters: event_data.parameters};
debug!("[{}] {:?}", packet.code, packet); debug!("EVENT: [{}] {:?}", packet.code, packet);
message = packet.decode() message = packet.decode();
} }
} }
} }
} else if msg_type == MSG_TYPE_REQUEST { } else if msg_type == MSG_TYPE_REQUEST {
} else if msg_type == MSG_TYPE_RESPONSE { } else if msg_type == MSG_TYPE_RESPONSE {
if let Some(response) = protocol16::deserialize_operation_response(&mut payload) {
let code = response.code as usize + RESPONSE_CONSTANT;
let packet = Packet{code, parameters: response.parameters};
debug!("RESPONSE: [{}] {:?}", packet.code, packet);
message = packet.decode();
}
} }
cursor.advance(operation_length as usize); cursor.advance(operation_length as usize);
+1 -1
View File
@@ -15,7 +15,7 @@ mod game_protocol;
fn main() { fn main() {
CombinedLogger::init(vec![ CombinedLogger::init(vec![
TermLogger::new(LevelFilter::Warn, Config::default(), TerminalMode::Mixed).unwrap(), TermLogger::new(LevelFilter::Info, Config::default(), TerminalMode::Mixed).unwrap(),
WriteLogger::new( WriteLogger::new(
LevelFilter::Trace, LevelFilter::Trace,
Config::default(), Config::default(),