Merge pull request #2195 from subspace/quic-buffer-fix

Fix QUIC buffer warning for DSN.
autonomys · Nov 6, 2023 · 0309f7b · 0309f7b
2 parents 599b767 + c0bb729
commit 0309f7b
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 100 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/subspace-networking/Cargo.toml b/crates/subspace-networking/Cargo.toml
@@ -49,7 +49,8 @@ unsigned-varint = { version = "0.7.1", features = ["futures", "asynchronous_code
 void = "1.0.2"
 
 [dependencies.libp2p]
-version = "0.52.3"
+git = "https://github.com/subspace/rust-libp2p"
+rev = "7a9328fc0a5f9e28575192d5f4f8663fde6752af"
 default-features = false
 features = [
     "autonat",
@@ -72,4 +73,4 @@ features = [
 
 [dev-dependencies]
 rand = "0.8.5"
-libp2p-swarm-test = "0.2.0"
+libp2p-swarm-test = { git = "https://github.com/subspace/rust-libp2p", rev = "7a9328fc0a5f9e28575192d5f4f8663fde6752af" }
diff --git a/crates/subspace-networking/src/constructor.rs b/crates/subspace-networking/src/constructor.rs
@@ -84,6 +84,10 @@ const TEMPORARY_BANS_DEFAULT_BACKOFF_RANDOMIZATION_FACTOR: f64 = 0.1;
 const TEMPORARY_BANS_DEFAULT_BACKOFF_MULTIPLIER: f64 = 1.5;
 const TEMPORARY_BANS_DEFAULT_MAX_INTERVAL: Duration = Duration::from_secs(30 * 60);
 
+/// We pause between reserved peers dialing otherwise we could do multiple dials to offline peers
+/// wasting resources and producing a ton of log records.
+const DIALING_INTERVAL_IN_SECS: Duration = Duration::from_secs(1);
+
 /// Specific YAMUX settings for Subspace applications: additional buffer space for pieces and
 /// substream's limit.
 ///
@@ -479,6 +483,7 @@ where
         reserved_peers: ReservedPeersConfig {
             reserved_peers: reserved_peers.clone(),
             protocol_name: RESERVED_PEERS_PROTOCOL_NAME,
+            dialing_interval: DIALING_INTERVAL_IN_SECS,
         },
         peer_info_config: PeerInfoConfig::new(PEER_INFO_PROTOCOL_NAME),
         peer_info_provider,

diff --git a/crates/subspace-networking/src/constructor/transport.rs b/crates/subspace-networking/src/constructor/transport.rs
@@ -50,7 +50,12 @@ pub(super) fn build_transport(
             .boxed()
     };
 
-    let quic = QuicTransport::new(QuicConfig::new(keypair))
+    #[cfg(not(windows))]
+    let quic_config = QuicConfig::new(keypair);
+    #[cfg(windows)]
+    let quic_config = QuicConfig::new(keypair).path_mtu_discovery_config(None);
+
+    let quic = QuicTransport::new(quic_config)
         .map(|(peer_id, muxer), _| (peer_id, StreamMuxerBox::new(muxer)));
 
     let wrapped_quic =