Photon fragments
This commit is contained in:
+34
-4
@@ -8,6 +8,9 @@ use simplelog::*;
|
||||
|
||||
use packet_sniffer::UdpPacket;
|
||||
|
||||
use photon_protocol;
|
||||
use photon_protocol::Photon;
|
||||
|
||||
use crate::game_protocol;
|
||||
use crate::meter;
|
||||
pub use meter::GameStats;
|
||||
@@ -78,6 +81,8 @@ pub fn initialize() -> Arc<Mutex<meter::Meter>> {
|
||||
thread::spawn(move || {
|
||||
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel();
|
||||
|
||||
let mut photon = Photon::new();
|
||||
|
||||
packet_sniffer::receive(tx);
|
||||
info!("Listening to network packets...");
|
||||
loop {
|
||||
@@ -86,9 +91,9 @@ pub fn initialize() -> Arc<Mutex<meter::Meter>> {
|
||||
continue;
|
||||
}
|
||||
let meter = &mut cloned_meter.lock().unwrap();
|
||||
if let Some(messages) = game_protocol::decode(&packet.payload) {
|
||||
register_messages(meter, &messages);
|
||||
}
|
||||
let game_messages = photon.decode(&packet.payload)
|
||||
.into_iter().filter_map(into_game_message).collect();
|
||||
register_messages(meter, &game_messages);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -96,7 +101,7 @@ pub fn initialize() -> Arc<Mutex<meter::Meter>> {
|
||||
meter
|
||||
}
|
||||
|
||||
fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol::Message>) {
|
||||
pub fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol::Message>) {
|
||||
messages
|
||||
.iter()
|
||||
.for_each(|message| register_message(meter, &message));
|
||||
@@ -136,6 +141,31 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
|
||||
}
|
||||
}
|
||||
|
||||
fn into_game_message(photon_message : photon_protocol::Message) -> Option<game_protocol::Message>
|
||||
{
|
||||
static REQUEST_CONSTANT: usize = 10000;
|
||||
static RESPONSE_CONSTANT: usize = 1000;
|
||||
|
||||
match photon_message {
|
||||
photon_protocol::Message::Event(e) => {
|
||||
if e.code != 2 && e.parameters.get(&252u8).is_some() {
|
||||
if let photon_protocol::Value::Short(event_code) = e.parameters.get(&252u8).unwrap() {
|
||||
return game_protocol::Packet{code: *event_code as usize, parameters: e.parameters}.decode()
|
||||
}
|
||||
}
|
||||
game_protocol::Packet{code: 0, parameters: e.parameters}
|
||||
},
|
||||
photon_protocol::Message::Request(r) => {
|
||||
let code = r.code as usize + REQUEST_CONSTANT;
|
||||
game_protocol::Packet{code, parameters: r.parameters}
|
||||
},
|
||||
photon_protocol::Message::Response(r) => {
|
||||
let code = r.code as usize + RESPONSE_CONSTANT;
|
||||
game_protocol::Packet{code, parameters: r.parameters}
|
||||
}
|
||||
}.decode()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
@@ -334,6 +334,8 @@ pub enum Message {
|
||||
|
||||
impl Packet {
|
||||
pub fn decode(self) -> Option<Message> {
|
||||
debug!("Decode: {:?}", &self);
|
||||
|
||||
match self.code {
|
||||
1 => Leave::encode(self.parameters),
|
||||
6 => HealthUpdate::encode(self.parameters),
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
mod packet;
|
||||
mod protocol;
|
||||
pub mod message;
|
||||
|
||||
pub use protocol::decode;
|
||||
pub use message::Message;
|
||||
pub use packet::Packet;
|
||||
|
||||
Reference in New Issue
Block a user