Missing npcap message prompt

This commit is contained in:
Wiktor Mazur
2019-11-11 16:54:41 +01:00
parent b0c8340b9f
commit ea72a56a20
8 changed files with 135 additions and 59 deletions
+27 -18
View File
@@ -25,6 +25,10 @@ pub use meter::PlayerStatisticsVec;
pub use meter::StatType;
pub enum InitializationError {
NetworkInterfaceListMissing
}
lazy_static! {
static ref METER: Mutex<meter::Meter> = Mutex::new(meter::Meter::new());
}
@@ -66,7 +70,7 @@ pub fn get_players_in_party(meter: &meter::Meter) -> Vec<String> {
meter.get_players_in_party().unwrap_or(vec![])
}
pub fn initialize() -> Arc<Mutex<meter::Meter>> {
pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
CombinedLogger::init(vec![WriteLogger::new(
LevelFilter::Info,
Config::default(),
@@ -78,28 +82,33 @@ pub fn initialize() -> Arc<Mutex<meter::Meter>> {
let meter = Arc::new(Mutex::new(meter));
let cloned_meter = meter.clone();
thread::spawn(move || {
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel();
let mut photon = Photon::new();
if let Ok(interfaces) = packet_sniffer::network_interfaces() {
thread::spawn(move || {
let (tx, rx): (Sender<UdpPacket>, Receiver<UdpPacket>) = channel();
packet_sniffer::receive(tx);
info!("Listening to network packets...");
loop {
if let Ok(packet) = rx.recv() {
if packet.destination_port != 5056 && packet.source_port != 5056 {
continue;
}
if let Ok(ref mut meter) = cloned_meter.lock() {
let game_messages = photon.decode(&packet.payload)
.into_iter().filter_map(into_game_message).collect();
register_messages(meter, &game_messages);
let mut photon = Photon::new();
packet_sniffer::receive(interfaces, tx);
info!("Listening to network packets...");
loop {
if let Ok(packet) = rx.recv() {
if packet.destination_port != 5056 && packet.source_port != 5056 {
continue;
}
if let Ok(ref mut meter) = cloned_meter.lock() {
let game_messages = photon.decode(&packet.payload)
.into_iter().filter_map(into_game_message).collect();
register_messages(meter, &game_messages);
}
}
}
}
});
});
} else {
return Err(InitializationError::NetworkInterfaceListMissing);
}
meter
Ok(meter)
}
pub fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol::Message>) {
+6 -1
View File
@@ -22,6 +22,7 @@ use cpython::FromPyObject;
use cpython::PyDict;
use crate::core::StatType;
use crate::core::InitializationError;
struct PyMeter
@@ -150,7 +151,11 @@ pub fn get_players_in_party(py: Python) -> PyResult<PyList> {
fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
if let Ok(ref mut py_meter) = METER.lock() {
py_meter.initialize(core::initialize());
match core::initialize() {
Ok(core_meter) => py_meter.initialize(core_meter),
Err(InitializationError::NetworkInterfaceListMissing) => return Ok(2)
};
if let Some(m) = py_meter.get() {
if let Ok(ref mut meter) = m.lock() {
meter.configure(core::MeterConfig {
-6
View File
@@ -1,13 +1,7 @@
use std::fmt;
use std::sync::{Arc, Mutex};
#[cfg(test)]
use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use log::*;
use timer;
use super::traits::CombatState;
use super::traits::DamageDealer;