Merge branch 'master' into dependabot/cargo/stun-0.5.0

libp2p · Sep 12, 2023 · 03beca0 · 03beca0
2 parents d7e0a3f + 0e64d71
commit 03beca0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/misc/server/CHANGELOG.md b/misc/server/CHANGELOG.md
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Add libp2p-lookup to Dockerfile to enable healthchecks.
 
+### Fixed
+
+- Disable QUIC `draft-29` support.
+  Listening on `/quic` and `/quic-v1` addresses with the same port would otherwise result in an "Address already in use" error by the OS.
+  See [PR 4467].
+
+[PR 4467]: https://github.com/libp2p/rust-libp2p/pull/4467
+
 ## [0.12.2]
 ### Fixed
 - Adhere to `--metrics-path` flag and listen on `0.0.0.0:8888` (default IPFS metrics port).

diff --git a/misc/server/src/main.rs b/misc/server/src/main.rs
@@ -89,11 +89,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 .multiplex(yamux::Config::default())
                 .timeout(Duration::from_secs(20));
 
-        let quic_transport = {
-            let mut config = quic::Config::new(&local_keypair);
-            config.support_draft_29 = true;
-            quic::tokio::Transport::new(config)
-        };
+        let quic_transport = quic::tokio::Transport::new(quic::Config::new(&local_keypair));
 
         dns::TokioDnsConfig::system(libp2p::core::transport::OrTransport::new(
             quic_transport,
@@ -126,6 +122,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
             Err(e) => return Err(e.into()),
         }
     }
+
     if config.addresses.append_announce.is_empty() {
         warn!("No external addresses configured.");
     }

diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 heck = "0.4"
 quote = "1.0"
-syn = { version = "2.0.31", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
+syn = { version = "2.0.32", default-features = false, features = ["clone-impls", "derive", "parsing", "printing", "proc-macro"] }
 proc-macro-warning = "0.4.2"
 proc-macro2 = "1.0"