diff --git a/backend/lib/packet-sniffer/Cargo.toml b/backend/lib/packet-sniffer/Cargo.toml index ec6feee..2f622c9 100644 --- a/backend/lib/packet-sniffer/Cargo.toml +++ b/backend/lib/packet-sniffer/Cargo.toml @@ -8,4 +8,10 @@ edition = "2018" [dependencies] pnet = "0.22.0" -log = { version = "0.4", features = ["std"] } \ No newline at end of file +log = { version = "0.4", features = ["std"] } + +[profile.dev] +panic = "unwind" + +[profile.release] +panic = "unwind" \ No newline at end of file diff --git a/backend/lib/packet-sniffer/src/lib.rs b/backend/lib/packet-sniffer/src/lib.rs index 6fe6746..929ac13 100644 --- a/backend/lib/packet-sniffer/src/lib.rs +++ b/backend/lib/packet-sniffer/src/lib.rs @@ -1,9 +1,9 @@ extern crate pnet; -use std::sync::{Arc, Mutex}; - use std::net::IpAddr; +use std::panic; use std::sync::mpsc::Sender; +use std::sync::{Arc, Mutex}; use std::thread; use pnet::datalink::{self, NetworkInterface}; @@ -25,23 +25,32 @@ pub struct UdpPacket { pub destination_address: IpAddr, pub destination_port: u16, pub length: u16, - pub payload: Vec + pub payload: Vec, } -pub fn receive(tx: Sender) { +pub type NetworkInterfaces = Vec; + +pub fn network_interfaces() -> Result { + let result = panic::catch_unwind(|| { + datalink::interfaces() + .into_iter() + .filter(|i| !i.is_loopback()) + .collect::() + }); + + match result { + Ok(interfaces) => Ok(interfaces), + Err(_) => Err("Unable to get interface list"), + } +} + +pub fn receive(interfaces: NetworkInterfaces, tx: Sender) { let shared_tx = Arc::new(Mutex::new(tx)); - - use pnet::datalink::Channel::Ethernet; - - let interfaces = datalink::interfaces() - .into_iter() - .filter(|i| !i.is_loopback()); - info!("Found interfaces: {:?}", interfaces); for interface in interfaces { let tx = shared_tx.clone(); - let config = pnet::datalink::Config{ + let config = pnet::datalink::Config { write_buffer_size: 65536, read_buffer_size: 65536, ..Default::default() @@ -49,15 +58,15 @@ pub fn receive(tx: Sender) { // Create a channel to receive on let (_, mut rx) = match datalink::channel(&interface, config) { - Ok(Ethernet(tx, rx)) => (tx, rx), + Ok(pnet::datalink::Channel::Ethernet(tx, rx)) => (tx, rx), Ok(_) => { warn!("packetdump: unhandled channel type"); continue; - }, - Err(e) => { + } + Err(e) => { warn!("packetdump: unable to create channel: {}", e); continue; - }, + } }; thread::spawn(move || { @@ -79,18 +88,30 @@ pub fn receive(tx: Sender) { fake_ethernet_frame.set_source(MacAddr(0, 0, 0, 0, 0, 0)); fake_ethernet_frame.set_ethertype(EtherTypes::Ipv4); fake_ethernet_frame.set_payload(&packet); - handle_ethernet_frame(&interface, &fake_ethernet_frame.to_immutable(), &tx); + handle_ethernet_frame( + &interface, + &fake_ethernet_frame.to_immutable(), + &tx, + ); continue; } else if version == 6 { fake_ethernet_frame.set_destination(MacAddr(0, 0, 0, 0, 0, 0)); fake_ethernet_frame.set_source(MacAddr(0, 0, 0, 0, 0, 0)); fake_ethernet_frame.set_ethertype(EtherTypes::Ipv6); fake_ethernet_frame.set_payload(&packet); - handle_ethernet_frame(&interface, &fake_ethernet_frame.to_immutable(), &tx); + handle_ethernet_frame( + &interface, + &fake_ethernet_frame.to_immutable(), + &tx, + ); continue; } } - handle_ethernet_frame(&interface, &EthernetPacket::new(packet).unwrap(), &tx); + handle_ethernet_frame( + &interface, + &EthernetPacket::new(packet).unwrap(), + &tx, + ); } Err(e) => warn!("packetdump: unable to receive packet: {}", e), } @@ -99,7 +120,11 @@ pub fn receive(tx: Sender) { } } -fn handle_ethernet_frame(interface: &NetworkInterface, ethernet: &EthernetPacket, tx: &Arc>>) { +fn handle_ethernet_frame( + interface: &NetworkInterface, + ethernet: &EthernetPacket, + tx: &Arc>>, +) { let interface_name = &interface.name[..]; match ethernet.get_ethertype() { EtherTypes::Ipv4 => handle_ipv4_packet(interface_name, ethernet, &tx), @@ -108,7 +133,11 @@ fn handle_ethernet_frame(interface: &NetworkInterface, ethernet: &EthernetPacket } } -fn handle_ipv4_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc>>) { +fn handle_ipv4_packet( + interface_name: &str, + ethernet: &EthernetPacket, + tx: &Arc>>, +) { let header = Ipv4Packet::new(ethernet.payload()); if let Some(header) = header { handle_transport_protocol( @@ -117,12 +146,16 @@ fn handle_ipv4_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc< IpAddr::V4(header.get_destination()), header.get_next_level_protocol(), header.payload(), - &tx + &tx, ); } } -fn handle_ipv6_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc>>) { +fn handle_ipv6_packet( + interface_name: &str, + ethernet: &EthernetPacket, + tx: &Arc>>, +) { let header = Ipv6Packet::new(ethernet.payload()); if let Some(header) = header { handle_transport_protocol( @@ -131,7 +164,7 @@ fn handle_ipv6_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc< IpAddr::V6(header.get_destination()), header.get_next_header(), header.payload(), - &tx + &tx, ); } } @@ -142,7 +175,7 @@ fn handle_transport_protocol( destination: IpAddr, protocol: IpNextHeaderProtocol, packet: &[u8], - tx: &Arc>> + tx: &Arc>>, ) { match protocol { IpNextHeaderProtocols::Udp => { @@ -152,18 +185,25 @@ fn handle_transport_protocol( } } -fn handle_udp_packet(interface_name: &str, source: IpAddr, destination: IpAddr, packet: &[u8], tx: &Arc>>) { +fn handle_udp_packet( + interface_name: &str, + source: IpAddr, + destination: IpAddr, + packet: &[u8], + tx: &Arc>>, +) { let udp = udp::UdpPacket::new(packet); let tx = tx.lock().unwrap(); if let Some(udp) = udp { - tx.send(UdpPacket{ + tx.send(UdpPacket { interface_name: String::from(interface_name), source_address: source, source_port: udp.get_source(), destination_address: destination, destination_port: udp.get_destination(), length: udp.get_length(), - payload: Vec::from(udp.payload()) - }).unwrap(); + payload: Vec::from(udp.payload()), + }) + .unwrap(); } } diff --git a/backend/src/core.rs b/backend/src/core.rs index 38ba68c..54f90a7 100644 --- a/backend/src/core.rs +++ b/backend/src/core.rs @@ -25,6 +25,10 @@ pub use meter::PlayerStatisticsVec; pub use meter::StatType; +pub enum InitializationError { + NetworkInterfaceListMissing +} + lazy_static! { static ref METER: Mutex = Mutex::new(meter::Meter::new()); } @@ -66,7 +70,7 @@ pub fn get_players_in_party(meter: &meter::Meter) -> Vec { meter.get_players_in_party().unwrap_or(vec![]) } -pub fn initialize() -> Arc> { +pub fn initialize() -> Result>, InitializationError> { CombinedLogger::init(vec![WriteLogger::new( LevelFilter::Info, Config::default(), @@ -78,28 +82,33 @@ pub fn initialize() -> Arc> { let meter = Arc::new(Mutex::new(meter)); let cloned_meter = meter.clone(); - thread::spawn(move || { - let (tx, rx): (Sender, Receiver) = channel(); - let mut photon = Photon::new(); + if let Ok(interfaces) = packet_sniffer::network_interfaces() { + thread::spawn(move || { + let (tx, rx): (Sender, Receiver) = 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) { diff --git a/backend/src/lib.rs b/backend/src/lib.rs index 8e87fd1..d7bab2f 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -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 { fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult { 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 { diff --git a/backend/src/meter/player.rs b/backend/src/meter/player.rs index b380b9a..05ecf45 100644 --- a/backend/src/meter/player.rs +++ b/backend/src/meter/player.rs @@ -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; diff --git a/frontend/src/app.py b/frontend/src/app.py index 5004ac1..cf681b3 100644 --- a/frontend/src/app.py +++ b/frontend/src/app.py @@ -10,13 +10,15 @@ from PySide2.QtWidgets import QMessageBox from .config import config from .main import MainWidget from .engine import initialize +from .engine import InitializationResult from .styling import style from .version import current_version as get_current_version from .version import latest_version as get_latest_version from .version import latest_url def run(): - initialize() + initialization_result = initialize() + conf = config() window_config = conf['window'] @@ -53,4 +55,14 @@ def run(): msg.setStandardButtons(QMessageBox.Ok) msg.show() + if initialization_result == InitializationResult.NetworkInterfaceListMissing: + msg = QMessageBox() + msg.setIcon(QMessageBox.Critical) + msg.setWindowTitle("Unable to track network traffic data!") + msg.setText("On windows make sure that WinPcap is installed in your system.") + msg.setInformativeText("WinPcap can be installed from here
Make sure to install with the \"Install Npcap in WinPcap API-compatible Mode\" option" + .format('https://nmap.org/npcap/dist/npcap-0.9983.exe')) + msg.setStandardButtons(QMessageBox.Ok) + msg.show() + sys.exit(app.exec_()) diff --git a/frontend/src/engine.py b/frontend/src/engine.py index a4388c4..e94ea94 100644 --- a/frontend/src/engine.py +++ b/frontend/src/engine.py @@ -14,6 +14,16 @@ class StatType: Zone = 2 Overall = 3 +class InitializationResult: + Ok = 0 + UnknownFailure = 1 + NetworkInterfaceListMissing = 2 + +INITIALIZATION_RESULT = { + 0: InitializationResult.Ok, + 1: InitializationResult.UnknownFailure, + 2: InitializationResult.NetworkInterfaceListMissing +} class DamageStat: def __init__(self, name, damage, time_in_combat, dps, percentage, best_damage): @@ -136,9 +146,9 @@ def reset_stats(): def initialize(): if TESTING_ENABLED: - return + return InitializationResult.Ok cfg = config() try: - aostats.initialize(cfg['app']['skip_non_party_players']) + return INITIALIZATION_RESULT[aostats.initialize(cfg['app']['skip_non_party_players'])] except: pass diff --git a/frontend/src/version.py b/frontend/src/version.py index b9b1f0f..d513a30 100644 --- a/frontend/src/version.py +++ b/frontend/src/version.py @@ -1,7 +1,7 @@ import os import requests -_version = "0.6.1" +_version = "0.6.2" latest_url = "https://github.com/mazurwiktor/albion-online-stats/releases/latest"