From 943b80bb8ab5e0f8f7a1365aeff3cd708d3a10ac Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <33485997+github-af@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:50:44 +0100 Subject: [PATCH 1/4] receive: really close and forget on synchronization lost (possibly fix issue #4 also) --- src/receive/dispatch.rs | 1 - src/receive/reordering.rs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/receive/dispatch.rs b/src/receive/dispatch.rs index 84be913..dfc700e 100644 --- a/src/receive/dispatch.rs +++ b/src/receive/dispatch.rs @@ -56,7 +56,6 @@ pub(crate) fn start(receiver: &receive::Receiver) -> Result<(), receive::E } failed_transfers.insert(client_id); - ended_transfers.insert(client_id, client_sendq); } active_transfers = BTreeMap::new(); continue; diff --git a/src/receive/reordering.rs b/src/receive/reordering.rs index 5fa551f..b943b27 100644 --- a/src/receive/reordering.rs +++ b/src/receive/reordering.rs @@ -20,7 +20,8 @@ pub(crate) fn start(receiver: &receive::Receiver) -> Result<(), receive::E let (resync_needed, resync_block_id) = receiver.resync_needed_block_id.take(); if resync_needed { - log::debug!("forced resynchronization"); + log::debug!("forced resynchronization, propagating it"); + receiver.to_dispatch.send(None)?; if pending_messages.iter().any(Option::is_some) { log::warn!("forced resynchronization with pending messages, dropping everything"); pending_messages.fill_with(|| None); From d92db563c678d92766ceb63b858ffaa9bd92e91e Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <33485997+github-af@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:51:27 +0100 Subject: [PATCH 2/4] version bump --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9c3866f..1c6b97f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "diode" -version = "1.3.3" +version = "1.3.4" edition = "2021" license = "GPL-3.0" From f46903d21b48810d947aa9de0e5ba89b4269def6 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <33485997+github-af@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:52:23 +0100 Subject: [PATCH 3/4] cargo update --- Cargo.lock | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 819e2c6..db5bd4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,11 +43,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys", ] @@ -77,18 +78,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.26" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" +checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.26" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ "anstream", "anstyle", @@ -134,7 +135,7 @@ dependencies = [ [[package]] name = "diode" -version = "1.3.3" +version = "1.3.4" dependencies = [ "clap", "crossbeam-channel", @@ -219,9 +220,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "num-conv" @@ -247,6 +248,12 @@ dependencies = [ "libc", ] +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + [[package]] name = "powerfmt" version = "0.2.0" @@ -264,9 +271,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] From 0016038bba02c201c4eb7799ab01e9a9f7cb51d5 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <33485997+github-af@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:43:06 +0100 Subject: [PATCH 4/4] also bump version in doc --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index fe03a18..cdf5e66 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -9,7 +9,7 @@ project = 'Lidi' copyright = '2023, ANSSI-FR' author = 'ANSSI-FR' -release = '1.3.3' +release = '1.3.4' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration