diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-04-10 17:11:02 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-04-10 19:57:09 +0200 |
| commit | 7070a9b345afb62f0da5d083a416b46c1efae409 (patch) | |
| tree | 257c4008946c345990b564f0105d707623f82f04 | |
| parent | cda329d361cdf4d1d13dbdb58e38c1e5e049762e (diff) | |
| download | mum-7070a9b345afb62f0da5d083a416b46c1efae409.tar.gz | |
increment status ping id
| -rw-r--r-- | mumd/src/command.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mumd/src/command.rs b/mumd/src/command.rs index 7eec388..04475aa 100644 --- a/mumd/src/command.rs +++ b/mumd/src/command.rs @@ -8,7 +8,7 @@ use crate::state::{ExecutionContext, State}; use log::*; use mumble_protocol::{Serverbound, control::ControlPacket}; use mumlib::command::{Command, CommandResponse}; -use std::sync::{Arc, RwLock}; +use std::sync::{atomic::{AtomicU64, Ordering}, Arc, RwLock}; use tokio::sync::{mpsc, oneshot, watch}; pub async fn handle( @@ -23,6 +23,7 @@ pub async fn handle( mut connection_info_sender: watch::Sender<Option<ConnectionInfo>>, ) { debug!("Begin listening for commands"); + let ping_count = AtomicU64::new(0); while let Some((command, response_sender)) = command_receiver.recv().await { debug!("Received command {:?}", command); let mut state = state.write().unwrap(); @@ -47,10 +48,12 @@ pub async fn handle( response_sender.send(generator()).unwrap(); } ExecutionContext::Ping(generator, converter) => { - match generator() { + let ret = generator(); + match ret { Ok(addr) => { + let id = ping_count.fetch_add(1, Ordering::Relaxed); let res = ping_request_sender.send(( - 0, + id, addr, Box::new(move |packet| { response_sender.send(converter(packet)).unwrap(); |
