feat(quic): Add draft-29 support

CHANGELOG.md

@@ -45,6 +45,11 @@
 
 # `libp2p` facade crate
 
+# 0.50.1 [unreleased]
+
+- Update individual crates.
+    - Update to [`libp2p-quic` `v0.7.1-alpha`](transports/quic/CHANGELOG.md).
+
 # 0.50.0
 
 This is a large release. After > 4 years, rust-libp2p ships with an [(alpha) QUIC

Cargo.toml

@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.62.0"
 description = "Peer-to-peer networking library"
-version = "0.50.0"
+version = "0.50.1"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -120,7 +120,7 @@ smallvec = "1.6.1"
 libp2p-deflate = { version = "0.38.0", path = "transports/deflate", optional = true }
 libp2p-dns = { version = "0.38.0", path = "transports/dns", optional = true }
 libp2p-mdns = { version = "0.42.0", path = "protocols/mdns", optional = true }
-libp2p-quic = { version = "0.7.0-alpha", path = "transports/quic", optional = true }
+libp2p-quic = { version = "0.7.1-alpha", path = "transports/quic", optional = true }
 libp2p-tcp = { version = "0.38.0", path = "transports/tcp", optional = true }
 libp2p-tls = { version = "0.1.0-alpha", path = "transports/tls", optional = true }
 libp2p-webrtc = { version = "0.4.0-alpha", path = "transports/webrtc", optional = true }

transports/quic/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.7.1-alpha [unreleased]
+
+- Add opt-in support for the `/quic` codepoint, interpreted as QUIC version draft-29.
+  See [PR 3151].
+
+[PR 3151]: https://github.com/libp2p/rust-libp2p/pull/3151
+
 # 0.7.0-alpha
 
 - Initial alpha release.

transports/quic/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-quic"
-version = "0.7.0-alpha"
+version = "0.7.1-alpha"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 rust-version = "1.62.0"

transports/quic/src/endpoint.rs

@@ -18,7 +18,11 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::{provider::Provider, transport::SocketFamily, ConnectError, Connection, Error};
+use crate::{
+    provider::Provider,
+    transport::{QuicVersion, SocketFamily},
+    ConnectError, Connection, Error,
+};
 
 use bytes::BytesMut;
 use futures::{
@@ -69,6 +73,16 @@ pub struct Config {
     /// of a connection.
     pub max_connection_data: u32,
 
+    /// Support QUIC version draft-29 for dialing and listening.
+    ///
+    /// Per default only QUIC Version 1 / [`libp2p_core::multiaddr::Protocol::QuicV1`]
+    /// is supported.
+    ///
+    /// If support for draft-29 is enabled servers support draft-29 and version 1 on all
+    /// QUIC listening addresses.
+    /// As client the version is chosen based on the remote's address.
+    pub support_draft_29: bool,
+
     /// TLS client config for the inner [`quinn_proto::ClientConfig`].
     client_tls_config: Arc<rustls::ClientConfig>,
     /// TLS server config for the inner [`quinn_proto::ServerConfig`].
@@ -83,6 +97,7 @@ impl Config {
         Self {
             client_tls_config,
             server_tls_config,
+            support_draft_29: false,
             handshake_timeout: Duration::from_secs(5),
             max_idle_timeout: 30 * 1000,
             max_concurrent_stream_limit: 256,
@@ -113,6 +128,7 @@ impl From<Config> for QuinnConfig {
             keep_alive_interval,
             max_connection_data,
             max_stream_data,
+            support_draft_29,
             handshake_timeout: _,
         } = config;
         let mut transport = quinn_proto::TransportConfig::default();
@@ -138,7 +154,10 @@ impl From<Config> for QuinnConfig {
         let mut client_config = quinn_proto::ClientConfig::new(client_tls_config);
         client_config.transport_config(transport);
 
-        let endpoint_config = quinn_proto::EndpointConfig::default();
+        let mut endpoint_config = quinn_proto::EndpointConfig::default();
+        if !support_draft_29 {
+            endpoint_config.supported_versions(vec![1]);
+        }
 
         QuinnConfig {
             client_config,
@@ -280,6 +299,8 @@ pub enum ToEndpoint {
     Dial {
         /// UDP address to connect to.
         addr: SocketAddr,
+        /// Version to dial the remote on.
+        version: QuicVersion,
         /// Channel to return the result of the dialing to.
         result: oneshot::Sender<Result<Connection, Error>>,
     },
@@ -403,18 +424,25 @@ impl<P: Provider> Driver<P> {
         to_endpoint: ToEndpoint,
     ) -> ControlFlow<(), Option<quinn_proto::Transmit>> {
         match to_endpoint {
-            ToEndpoint::Dial { addr, result } => {
+            ToEndpoint::Dial {
+                addr,
+                result,
+                version,
+            } => {
+                let mut config = self.client_config.clone();
+                if version == QuicVersion::Draft29 {
+                    config.version(0xff00_001d);
+                }
                 // This `"l"` seems necessary because an empty string is an invalid domain
                 // name. While we don't use domain names, the underlying rustls library
                 // is based upon the assumption that we do.
-                let (connection_id, connection) =
-                    match self.endpoint.connect(self.client_config.clone(), addr, "l") {
-                        Ok(c) => c,
-                        Err(err) => {
-                            let _ = result.send(Err(ConnectError::from(err).into()));
-                            return ControlFlow::Continue(None);
-                        }
-                    };
+                let (connection_id, connection) = match self.endpoint.connect(config, addr, "l") {
+                    Ok(c) => c,
+                    Err(err) => {
+                        let _ = result.send(Err(ConnectError::from(err).into()));
+                        return ControlFlow::Continue(None);
+                    }
+                };
 
                 debug_assert_eq!(connection.side(), quinn_proto::Side::Client);
                 let (tx, rx) = mpsc::channel(CHANNEL_CAPACITY);