X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/143d53ed1d795c5c5f6e0773ab3c71700d3ef9a0..5b8bd04910bea5ce2b70e922b1eb063475d52b5c:/server/src/main.rs diff --git a/server/src/main.rs b/server/src/main.rs index c4c0b19..94a47d8 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -14,11 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +use std::collections::HashMap; use std::net::UdpSocket; +use std::time::{Duration, SystemTime}; const MESSAGE_SIZE: usize = 12; -#[derive(Debug)] +#[derive(Eq, Debug, Hash, PartialEq)] struct MessageKey { epoch: u32, device: u16, @@ -29,17 +31,20 @@ struct MessageKey { struct Message { key: MessageKey, ago: u32, + t: SystemTime, } impl From<&[u8; MESSAGE_SIZE]> for Message { fn from(value: &[u8; MESSAGE_SIZE]) -> Self { + let ago = u32::from_be_bytes(value[8..=11].try_into().expect("I can't count")); Self { key: MessageKey { epoch: u32::from_be_bytes(value[0..=3].try_into().expect("I can't count")), device: u16::from_be_bytes(value[4..=5].try_into().expect("I can't count")), seq: u16::from_be_bytes(value[6..=7].try_into().expect("I can't count")), }, - ago: u32::from_be_bytes(value[8..=11].try_into().expect("I can't count")), + ago, + t: SystemTime::now() - Duration::new(ago.into(), 0), } } } @@ -53,7 +58,30 @@ impl TryFrom<&[u8]> for Message { } } +#[derive(Debug)] +struct Range { + start: SystemTime, + end: SystemTime, +} +impl Range { + fn new(t: &SystemTime) -> Self { + Self { start: *t, end: *t } + } + fn contains(&self, t: &SystemTime) -> bool { + t > &self.start && t < &self.end + } + fn extend(&mut self, t: &SystemTime) { + if t < &self.start { + self.start = *t; + } + if t > &self.end { + self.end = *t; + } + } +} + fn main() { + let mut presses = HashMap::::new(); let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address"); loop { let mut buf = [0; MESSAGE_SIZE]; @@ -66,7 +94,15 @@ fn main() { continue; } let message = Message::try_from(filled_buf).expect("I can't count"); - println!("Got packet from {src_addr}: {message:?}"); + if let Some(r) = presses.get_mut(&message.key) { + if !r.contains(&message.t) { + r.extend(&message.t); + println!("Updated press: {:?}: {r:?}", message.key); + } + } else { + println!("Got new press: {:?}: {:?}", message.key, message.t); + presses.insert(message.key, Range::new(&message.t)); + } } } }