From 374b399631d76125c7c668f1397bacaf9eca4701 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 4 Aug 2023 16:33:39 +0700 Subject: [PATCH] Fix simultaneous discovery subscription --- .../core/src/bc_protocol/connection/bcconn.rs | 1 + .../src/bc_protocol/connection/discovery.rs | 57 ++++++++++++------- crates/core/src/bcudp/ser.rs | 2 +- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/crates/core/src/bc_protocol/connection/bcconn.rs b/crates/core/src/bc_protocol/connection/bcconn.rs index a6756e9..29b549d 100644 --- a/crates/core/src/bc_protocol/connection/bcconn.rs +++ b/crates/core/src/bc_protocol/connection/bcconn.rs @@ -295,6 +295,7 @@ impl Poller { if occ_entry.get().is_closed() { occ_entry.insert(tx); } else { + // log::error!("Failed to subscribe in bcconn to {:?} for {:?}", msg_num, msg_id); let _ = tx .send(Err(Error::SimultaneousSubscription { msg_num })) .await; diff --git a/crates/core/src/bc_protocol/connection/discovery.rs b/crates/core/src/bc_protocol/connection/discovery.rs index e015480..0709724 100644 --- a/crates/core/src/bc_protocol/connection/discovery.rs +++ b/crates/core/src/bc_protocol/connection/discovery.rs @@ -78,12 +78,14 @@ lazy_static! { } type Subscriber = Arc>>>>; +type Handlers = Arc>>>>; type ArcFramedSocket = UdpFramed>; pub(crate) struct Discoverer { socket: Arc, handle: RwLock>, writer: Sender>, subsribers: Subscriber, + handlers: Handlers, local_addr: SocketAddr, } @@ -96,26 +98,27 @@ impl Discoverer { let (mut writer, mut reader) = inner.split(); let mut set = JoinSet::new(); let subsribers: Subscriber = Default::default(); + let handlers: Handlers = Default::default(); let thread_subscriber = subsribers.clone(); + let thread_handlers = handlers.clone(); set.spawn(async move { loop { tokio::task::yield_now().await; match reader.next().await { Some(Ok((BcUdp::Discovery(bcudp), addr))) => { - let mut tid = bcudp.tid; + let tid = bcudp.tid; let mut needs_removal = false; - if let Some(sender) = thread_subscriber.read().await.get(&tid) { + if let (Some(sender), true) = + (thread_subscriber.read().await.get(&tid), tid > 0) + { if sender.send(Ok((bcudp, addr))).await.is_err() { needs_removal = true; } - } else if let Some(any_sender) = thread_subscriber.read().await.get(&0) { - if any_sender.send(Ok((bcudp, addr))).await.is_err() { - tid = 0; // To make is remove 0 - needs_removal = true; - } } else { - trace!("Udp Discovery got this unexpected BcUdp {:?}", bcudp); + for sender in thread_handlers.write().await.iter_mut() { + let _ = sender.send(Ok((bcudp.clone(), addr))).await; + } } if needs_removal { thread_subscriber.write().await.remove(&tid); @@ -148,6 +151,7 @@ impl Discoverer { handle: RwLock::new(set), writer: sinker, subsribers, + handlers, local_addr, }) } @@ -157,24 +161,33 @@ impl Discoverer { } async fn subscribe(&self, tid: u32) -> Result>> { - let mut subs = self.subsribers.write().await; - match subs.entry(tid) { - Entry::Vacant(vacant) => { - let (tx, rx) = channel(10); - vacant.insert(tx); - Ok(rx) - } - Entry::Occupied(mut occ) => { - if occ.get().is_closed() { + if tid > 0 { + let mut subs = self.subsribers.write().await; + match subs.entry(tid) { + Entry::Vacant(vacant) => { let (tx, rx) = channel(10); - occ.insert(tx); + vacant.insert(tx); Ok(rx) - } else { - Err(Error::SimultaneousSubscription { - msg_num: Some(tid as u16), - }) + } + Entry::Occupied(mut occ) => { + if occ.get().is_closed() { + let (tx, rx) = channel(10); + occ.insert(tx); + Ok(rx) + } else { + // log::error!("Failed to subscribe in discovery to {:?}", tid); + Err(Error::SimultaneousSubscription { + msg_num: Some(tid as u16), + }) + } } } + } else { + // If tid is zero we listen to all! + let mut handlers = self.handlers.write().await; + let (tx, rx) = channel(10); + handlers.push(tx); + Ok(rx) } } diff --git a/crates/core/src/bcudp/ser.rs b/crates/core/src/bcudp/ser.rs index e055e2e..b566d8a 100644 --- a/crates/core/src/bcudp/ser.rs +++ b/crates/core/src/bcudp/ser.rs @@ -52,7 +52,7 @@ fn bcudp_ack<'a, W: 'a + Write>( le_u32(0), le_u32(payload.group_id), le_u32(payload.packet_id), - le_u32(0xd7160000), + le_u32(0), le_u32(binary_payload.len() as u32), slice(binary_payload), ))