diff --git a/lib/packet-sniffer/src/lib.rs b/lib/packet-sniffer/src/lib.rs index cd6514e..4347767 100644 --- a/lib/packet-sniffer/src/lib.rs +++ b/lib/packet-sniffer/src/lib.rs @@ -27,11 +27,22 @@ pub struct UdpPacket { pub fn receive(tx: Sender) { use pnet::datalink::Channel::Ethernet; let interfaces = datalink::interfaces(); - let interface = interfaces + let up_interface = datalink::interfaces() + .into_iter() + .filter(|i| !i.is_loopback() && !i.is_up()) + .next(); + + let any_interface = datalink::interfaces() .into_iter() .filter(|i| !i.is_loopback()) - .next() - .unwrap(); + .next(); + + let interface = if up_interface.is_some() { + up_interface.unwrap() + } else { + any_interface.unwrap() + }; + // Create a channel to receive on let (_, mut rx) = match datalink::channel(&interface, Default::default()) { diff --git a/src/game_protocol/protocol.rs b/src/game_protocol/protocol.rs index 8560058..3565a16 100644 --- a/src/game_protocol/protocol.rs +++ b/src/game_protocol/protocol.rs @@ -10,6 +10,7 @@ static LOG_OUT: u8 = 4; static SEND_UNRELIABLE: u8 = 7; static SEND_RELIABLE: u8 = 6; +static REQUEST_CONSTANT: usize = 10000; static RESPONSE_CONSTANT: usize = 1000; static MSG_TYPE_REQUEST: u8 = 2; @@ -77,7 +78,13 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option { } } } else if msg_type == MSG_TYPE_REQUEST { + if let Some(request) = protocol16::deserialize_operation_request(&mut payload) { + let code = request.code as usize + REQUEST_CONSTANT; + let packet = Packet{code, parameters: request.parameters}; + debug!("REQUEST: [{}] {:?}", packet.code, packet); + message = packet.decode(); + } } 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;