private

aws · Jun 11, 2024 · 384a116 · 384a116
1 parent 50ddba4
commit 384a116
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/quic/s2n-quic-core/src/path/mtu.rs b/quic/s2n-quic-core/src/path/mtu.rs
@@ -305,26 +305,29 @@ impl Config {
     pub fn is_valid(&self) -> bool {
         self.base_mtu.0 <= self.initial_mtu.0 && self.initial_mtu.0 <= self.max_mtu.0
     }
+}
+
+// A checked MTU Config created after validating the values from the
+// IO provider against the values from mtu provider.
+#[derive(Copy, Clone, Debug, Default)]
+pub struct CheckedConfig(Config);
 
+impl CheckedConfig {
     // Check that the Application provided MTU values are valid for this endpoint.
-    pub fn checked(self, info: &mtu::ConnectionInfo) -> Result<CheckedConfig, MtuError> {
-        ensure!(self.is_valid(), Err(MtuError::Validation));
+    pub fn new_checked(
+        config: Config,
+        info: &mtu::ConnectionInfo,
+    ) -> Result<CheckedConfig, MtuError> {
+        ensure!(config.is_valid(), Err(MtuError::Validation));
         // ensure that the max_mtu is <= the value configured on the IO provider.
         ensure!(
-            u16::from(self.max_mtu) <= u16::from(info.endpoint_config.max_mtu),
+            u16::from(config.max_mtu) <= u16::from(info.endpoint_config.max_mtu),
             Err(MtuError::Validation)
         );
 
-        Ok(CheckedConfig(self))
+        Ok(CheckedConfig(config))
     }
-}
 
-// A checked MTU Config created after validating the values from the
-// IO provider against the values from mtu provider.
-#[derive(Copy, Clone, Debug, Default)]
-pub struct CheckedConfig(Config);
-
-impl CheckedConfig {
     pub fn initial_mtu(&self) -> InitialMtu {
         self.0.initial_mtu
     }

diff --git a/quic/s2n-quic-transport/src/endpoint/initial.rs b/quic/s2n-quic-transport/src/endpoint/initial.rs
@@ -20,7 +20,7 @@ use s2n_quic_core::{
     event::{self, supervisor, ConnectionPublisher, IntoEvent, Subscriber as _},
     inet::{datagram, DatagramInfo},
     packet::initial::ProtectedInitial,
-    path::{mtu, mtu::Configurator as _, Handle as _},
+    path::{mtu, mtu::Configurator as _, CheckedConfig, Handle as _},
     stateless_reset::token::Generator as _,
     transport::{self, parameters::ServerTransportParameters},
 };
@@ -175,7 +175,7 @@ impl<Config: endpoint::Config> endpoint::Endpoint<Config> {
             .context()
             .mtu
             .on_connection(&info)
-            .and_then(|config| config.checked(&info))
+            .and_then(|config| CheckedConfig::new_checked(config, &info))
             .map_err(|_| {
                 // TODO emit datagram dropped event
                 connection::Error::validation("failed to instantiate a valid MTU provider")

diff --git a/quic/s2n-quic-transport/src/endpoint/mod.rs b/quic/s2n-quic-transport/src/endpoint/mod.rs
@@ -39,7 +39,7 @@ use s2n_quic_core::{
     io::{rx, tx},
     packet::{initial::ProtectedInitial, interceptor::Interceptor, ProtectedPacket},
     path,
-    path::{mtu, mtu::Configurator as _, Handle as _},
+    path::{mtu, mtu::Configurator as _, CheckedConfig, Handle as _},
     random::Generator as _,
     stateless_reset::token::{Generator as _, LEN as StatelessResetTokenLen},
     time::{Clock, Timestamp},
@@ -560,7 +560,7 @@ impl<Cfg: Config> Endpoint<Cfg> {
             let mtu_config = endpoint_context
                 .mtu
                 .on_connection(&info)
-                .and_then(|config| config.checked(&info));
+                .and_then(|config| CheckedConfig::new_checked(config, &info));
             let mtu_config = match mtu_config {
                 Ok(config) => config,
                 Err(_) => {
@@ -1069,7 +1069,7 @@ impl<Cfg: Config> Endpoint<Cfg> {
         let mtu_config = endpoint_context
             .mtu
             .on_connection(&info)
-            .and_then(|config| config.checked(&info))
+            .and_then(|config| CheckedConfig::new_checked(config, &info))
             .map_err(|_err| {
                 // TODO emit datagram dropped event
                 connection::Error::validation("failed to instantiate a valid MTU provider")