From 8f21ace578bf11cb46704a23b7d1e4021dcc205e Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Wed, 16 Aug 2023 11:56:34 +0700 Subject: [PATCH] Abort the inner udp handle on drop --- crates/core/src/bc_protocol/connection/udpsource.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/crates/core/src/bc_protocol/connection/udpsource.rs b/crates/core/src/bc_protocol/connection/udpsource.rs index 141316f..861e553 100644 --- a/crates/core/src/bc_protocol/connection/udpsource.rs +++ b/crates/core/src/bc_protocol/connection/udpsource.rs @@ -19,6 +19,7 @@ use std::task::{Context, Poll}; use tokio::sync::mpsc::channel; use tokio::{ net::UdpSocket, + task::JoinHandle, time::{interval, sleep, Duration, Instant, Interval, Sleep}, }; use tokio_stream::wrappers::ReceiverStream; @@ -262,6 +263,13 @@ impl AckLatency { pub(crate) struct UdpPayloadSource { inner_stream: ReceiverStream>>, inner_sink: PollSender>, + handle: JoinHandle>, +} + +impl Drop for UdpPayloadSource { + fn drop(&mut self) { + self.handle.abort(); + } } struct UdpPayloadInner { @@ -444,7 +452,7 @@ impl UdpPayloadSource { client_id, camera_id, ); - tokio::task::spawn(async move { + let handle = tokio::task::spawn(async move { loop { match payload_inner.run().await { Ok(()) => {} @@ -464,6 +472,7 @@ impl UdpPayloadSource { UdpPayloadSource { inner_stream: ReceiverStream::new(inner_stream), inner_sink: PollSender::new(inner_sink), + handle, } } }