mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-06-28 11:00:34 +00:00
webrtc/signalling: fix race condition in message ordering
Spawning one task per message to send out instead of sending them out sequentially from the one task used to poll the handler sometimes resulted in peers receiving ICE candidates before SDP offers, triggering hard to understand errors in the browser. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1253>
This commit is contained in:
parent
d3cda3dd3a
commit
12f1f5b097
|
@ -38,7 +38,7 @@ impl Server {
|
|||
#[instrument(level = "debug", skip(factory))]
|
||||
pub fn spawn<
|
||||
I: for<'a> Deserialize<'a>,
|
||||
O: Serialize + std::fmt::Debug,
|
||||
O: Serialize + std::fmt::Debug + Send + Sync,
|
||||
Factory: FnOnce(Pin<Box<dyn Stream<Item = (String, Option<I>)> + Send>>) -> St,
|
||||
St: Stream<Item = (String, O)>,
|
||||
>(
|
||||
|
@ -72,12 +72,19 @@ impl Server {
|
|||
task::spawn(async move {
|
||||
while let Some((peer_id, msg)) = handler.next().await {
|
||||
match serde_json::to_string(&msg) {
|
||||
Ok(msg) => {
|
||||
if let Some(peer) = state_clone.lock().unwrap().peers.get_mut(&peer_id) {
|
||||
let mut sender = peer.sender.clone();
|
||||
task::spawn(async move {
|
||||
let _ = sender.send(msg).await;
|
||||
});
|
||||
Ok(msg_str) => {
|
||||
let sender = {
|
||||
let mut state = state_clone.lock().unwrap();
|
||||
if let Some(peer) = state.peers.get_mut(&peer_id) {
|
||||
Some(peer.sender.clone())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
};
|
||||
|
||||
if let Some(mut sender) = sender {
|
||||
trace!("Sending {}", msg_str);
|
||||
let _ = sender.send(msg_str).await;
|
||||
}
|
||||
}
|
||||
Err(err) => {
|
||||
|
|
Loading…
Reference in a new issue