Configured logger

This commit is contained in:
Wiktor Mazur
2019-08-04 19:30:33 +02:00
parent d8b558055a
commit 3ebd31a781
7 changed files with 358 additions and 10 deletions
+1 -2
View File
@@ -11,7 +11,6 @@ pub struct ChatSay {
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 };
@@ -20,13 +19,13 @@ impl ChatSay {
}
}
#[derive(Debug)]
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
+1
View File
@@ -1,5 +1,6 @@
use protocol16::Parameters;
#[derive(Debug)]
pub struct Packet {
pub code: usize,
pub parameters: Parameters
+3
View File
@@ -1,6 +1,8 @@
use std::io::Cursor;
use bytes::Buf;
use log::*;
static CMD_HEADER_LENGTH: u32 = 12;
static SIGNIFIER_BYTE_LENGTH: usize = 1;
@@ -67,6 +69,7 @@ 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 let protocol16::Value::Short(code) = event_data.parameters.get(&252u8)? {
let packet = Packet{code: *code as usize, parameters: event_data.parameters};
debug!("{:?}", packet);
message = packet.decode()
}
}
+16 -6
View File
@@ -1,17 +1,29 @@
extern crate bytes;
extern crate packet_sniffer;
extern crate protocol16;
use std::fs::File;
use std::sync::mpsc::{Sender, Receiver};
use std::sync::mpsc;
use simplelog::*;
use log::*;
use packet_sniffer::UdpPacket;
mod game_protocol;
fn main() {
CombinedLogger::init(vec![
TermLogger::new(LevelFilter::Warn, Config::default(), TerminalMode::Mixed).unwrap(),
WriteLogger::new(
LevelFilter::Trace,
Config::default(),
File::create("packet-sniffer.log").unwrap(),
),
])
.unwrap();
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = mpsc::channel();
packet_sniffer::receive(tx);
@@ -24,9 +36,7 @@ fn main() {
let messages = game_protocol::decode(&packet.payload);
for msg in messages {
if let game_protocol::Message::ChatSay(m) = msg {
println!("Found message {:?}", m);
}
info!("Found message {:?}", msg);
}
}