Merge branch 'connection-limit-whitelist' of https://github.com/drHua…

…ngMHT/rust-libp2p into connection-limit-whitelist
libp2p · Feb 5, 2025 · d5877b4 · d5877b4
2 parents 9bb4dff + 790aa6b
commit d5877b4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,7 +74,7 @@ rust-version = "1.83.0"
 [workspace.dependencies]
 libp2p = { version = "0.55.1", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.5.0", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.14.0", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.14.1", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.5.1", path = "misc/connection-limits" }
 libp2p-core = { version = "0.43.0", path = "core" }
 libp2p-dcutr = { version = "0.13.0", path = "protocols/dcutr" }

diff --git a/protocols/autonat/CHANGELOG.md b/protocols/autonat/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.14.1
+
+- Fix infinity loop on wrong `nonce` when performing `dial_back`.
+  See [PR 5848](https://github.com/libp2p/rust-libp2p/pull/5848).
+
 ## 0.14.0
 
 - Verify that an incoming AutoNAT dial comes from a connected peer. See [PR 5597](https://github.com/libp2p/rust-libp2p/pull/5597).

diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-autonat"
 edition = "2021"
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
-version = "0.14.0"
+version = "0.14.1"
 authors = [
     "David Craven <[email protected]>",
     "Elena Frank <[email protected]>",

diff --git a/protocols/autonat/src/v2/client/handler/dial_back.rs b/protocols/autonat/src/v2/client/handler/dial_back.rs
@@ -109,12 +109,7 @@ fn perform_dial_back(
             match receiver.await {
                 Ok(Ok(())) => {}
                 Ok(Err(e)) => return Some((Err(e), state)),
-                Err(_) => {
-                    return Some((
-                        Err(io::Error::new(io::ErrorKind::Other, "Sender got cancelled")),
-                        state,
-                    ));
-                }
+                Err(_) => return None,
             }
             if let Err(e) = protocol::dial_back_response(&mut state.stream).await {
                 return Some((Err(e), state));