Merge branch 'master' into websys-rtc

DougAnderson444 · Sep 12, 2023 · a0abc3e · a0abc3e
2 parents 6e3cfe6 + 92b5721
commit a0abc3e
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 24 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/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
@@ -26,7 +26,7 @@ multihash = { workspace = true }
 rand = "0.8"
 rcgen = "0.10.0"
 serde = { version = "1.0", features = ["derive"] }
-stun = "0.4"
+stun = "0.5"
 thiserror = "1"
 tinytemplate = "1.2"
 tokio = { version = "1.32", features = ["net"], optional = true}