add udp_max_payload_size config option to PlainQuicPort

Author: zh-jq

lib/vey-daemon/src/listen/quic.rs

@@ -12,7 +12,7 @@ use std::time::Duration;
 use anyhow::anyhow;
 use async_trait::async_trait;
 use log::{info, warn};
-use quinn::{Connection, Endpoint, Incoming};
+use quinn::{Connection, Endpoint, EndpointConfig, Incoming, ServerConfig};
 use tokio::runtime::Handle;
 use tokio::sync::broadcast;
 
@@ -43,6 +43,7 @@ pub struct ListenQuicRuntime<S> {
     server: S,
     listen_config: UdpListenConfig,
     listen_stats: Arc<ListenStats>,
+    payload_max_size: Option<u16>,
     #[cfg(feature = "ebpf")]
     socket_selector: Option<QuicSocketSelector>,
 }
@@ -51,11 +52,17 @@ impl<S> ListenQuicRuntime<S>
 where
     S: AcceptQuicServer + ReloadServer + Clone + Send + Sync + 'static,
 {
-    pub fn new(server: S, listen_stats: Arc<ListenStats>, listen_config: UdpListenConfig) -> Self {
+    pub fn new(
+        server: S,
+        listen_stats: Arc<ListenStats>,
+        listen_config: UdpListenConfig,
+        payload_max_size: Option<u16>,
+    ) -> Self {
         ListenQuicRuntime {
             server,
             listen_config,
             listen_stats,
+            payload_max_size,
             #[cfg(feature = "ebpf")]
             socket_selector: None,
         }
@@ -64,7 +71,7 @@ where
     pub fn run_all_instances(
         &mut self,
         listen_in_worker: bool,
-        quic_config: &quinn::ServerConfig,
+        quic_config: &ServerConfig,
         ingress_net_filter: Option<&Arc<AclNetworkRule>>,
         accept_timeout: Duration,
         server_reload_sender: &broadcast::Sender<ServerReloadCommand<ListenQuicInPlaceConfig>>,
@@ -116,6 +123,13 @@ where
             };
             let listen_addr = socket.local_addr()?;
 
+            let mut endpoint_config = EndpointConfig::default();
+            if let Some(payload_max_size) = self.payload_max_size
+                && let Err(e) = endpoint_config.max_udp_payload_size(payload_max_size)
+            {
+                warn!("ignored UDP payload size {payload_max_size}: {e}");
+            }
+
             let runtime = ListenQuicRuntimeInstance {
                 server: self.server.clone(),
                 server_type: self.server.r#type(),
@@ -134,6 +148,7 @@ where
             };
             runtime.into_running(
                 socket,
+                endpoint_config,
                 quic_config.clone(),
                 server_reload_sender.subscribe(),
             );
@@ -460,16 +475,17 @@ where
     fn into_running(
         mut self,
         socket: UdpSocket,
-        config: quinn::ServerConfig,
+        endpoint_config: EndpointConfig,
+        server_config: ServerConfig,
         server_reload_channel: broadcast::Receiver<ServerReloadCommand<ListenQuicInPlaceConfig>>,
     ) {
         let handle = self.get_rt_handle();
         handle.spawn(async move {
             let raw_socket = RawSocket::from(&socket);
             // make sure the listen socket associated with the correct reactor
             match Endpoint::new(
-                Default::default(),
-                Some(config),
+                endpoint_config,
+                Some(server_config),
                 socket,
                 Arc::new(quinn::TokioRuntime),
             ) {

sphinx/vey-gateway/configuration/servers/plain_quic_port.rst

@@ -28,17 +28,16 @@ quic_server
 
 Set the cryptographic configuration for this QUIC server.
 
-offline_rebind_port
--------------------
+udp_payload_max_size
+--------------------
 
 **optional**, **type**: u16
 
-Set a rebind port used during graceful shutdown.
+Set the max UDP payload size. The value should be in inclusive range 1200..65527.
 
-The new port must be reachable by clients or the handoff will not work as
-expected.
+**default**: not set, which should be 1472 in underlying quic implementation.
 
-**default**: not set
+.. versionadded:: 0.4.0
 
 server
 ------

sphinx/vey-proxy/conf.py

@@ -6,7 +6,7 @@
 project = 'vey-proxy'
 copyright = '2020 - %Y, Zhang Jingqiang'
 author = 'Zhang Jingqiang'
-release = '1.13.8'
+release = '1.13.9'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

sphinx/vey-proxy/configuration/servers/plain_quic_port.rst

@@ -32,16 +32,16 @@ quic_server
 
 Cryptographic configuration for this QUIC server.
 
-offline_rebind_port
--------------------
+udp_payload_max_size
+--------------------
 
 **optional**, **type**: u16
 
-Rebind port used for graceful shutdown.
+Set the max UDP payload size. The value should be in inclusive range 1200..65527.
 
-The new port should be reachable from the client or it won't work as expected.
+**default**: not set, which should be 1472 in underlying quic implementation.
 
-**default**: not set
+.. versionadded:: 1.13.9
 
 server
 ------

vey-gateway/src/config/server/plain_quic_port.rs

@@ -41,7 +41,7 @@ pub(crate) struct PlainQuicPortConfig {
     pub(crate) tls_ticketer: Option<TlsTicketConfig>,
     pub(crate) ingress_net_filter: Option<AclNetworkRuleBuilder>,
     pub(crate) server: NodeName,
-    pub(crate) offline_rebind_port: Option<u16>,
+    pub(crate) udp_payload_max_size: Option<u16>,
 }
 
 impl PlainQuicPortConfig {
@@ -55,7 +55,7 @@ impl PlainQuicPortConfig {
             tls_ticketer: None,
             ingress_net_filter: None,
             server: NodeName::default(),
-            offline_rebind_port: None,
+            udp_payload_max_size: None,
         }
     }
 
@@ -87,9 +87,9 @@ impl PlainQuicPortConfig {
                 self.listen_in_worker = vey_yaml::value::as_bool(v)?;
                 Ok(())
             }
-            "offline_rebind_port" => {
-                let port = vey_yaml::value::as_u16(v)?;
-                self.offline_rebind_port = Some(port);
+            "udp_payload_max_size" => {
+                let size = vey_yaml::value::as_u16(v)?;
+                self.udp_payload_max_size = Some(size);
                 Ok(())
             }
             "quic_server" => {

vey-gateway/src/serve/plain_quic_port/mod.rs

@@ -238,8 +238,12 @@ impl ServerInternal for PlainQuicPort {
     fn _start_runtime(&self, server: ArcServer) -> anyhow::Result<()> {
         let config = self.config.load();
         let listen_stats = server.get_listen_stats();
-        let mut runtime =
-            ListenQuicRuntime::new(WrapArcServer(server), listen_stats, config.listen.clone());
+        let mut runtime = ListenQuicRuntime::new(
+            WrapArcServer(server),
+            listen_stats,
+            config.listen.clone(),
+            config.udp_payload_max_size,
+        );
         runtime.run_all_instances(
             config.listen_in_worker,
             &self.quinn_config,

vey-proxy/src/config/server/plain_quic_port.rs

@@ -41,7 +41,7 @@ pub(crate) struct PlainQuicPortConfig {
     pub(crate) tls_ticketer: Option<TlsTicketConfig>,
     pub(crate) ingress_net_filter: Option<AclNetworkRuleBuilder>,
     pub(crate) server: NodeName,
-    pub(crate) offline_rebind_port: Option<u16>,
+    pub(crate) udp_payload_max_size: Option<u16>,
 }
 
 impl PlainQuicPortConfig {
@@ -55,7 +55,7 @@ impl PlainQuicPortConfig {
             tls_ticketer: None,
             ingress_net_filter: None,
             server: NodeName::default(),
-            offline_rebind_port: None,
+            udp_payload_max_size: None,
         }
     }
 
@@ -87,9 +87,9 @@ impl PlainQuicPortConfig {
                 self.listen_in_worker = vey_yaml::value::as_bool(v)?;
                 Ok(())
             }
-            "offline_rebind_port" => {
-                let port = vey_yaml::value::as_u16(v)?;
-                self.offline_rebind_port = Some(port);
+            "udp_payload_max_size" => {
+                let size = vey_yaml::value::as_u16(v)?;
+                self.udp_payload_max_size = Some(size);
                 Ok(())
             }
             "quic_server" => {

vey-proxy/src/serve/plain_quic_port/mod.rs

@@ -244,8 +244,12 @@ impl ServerInternal for PlainQuicPort {
     fn _start_runtime(&self, server: ArcServer) -> anyhow::Result<()> {
         let config = self.config.load();
         let listen_stats = server.get_listen_stats();
-        let mut runtime =
-            ListenQuicRuntime::new(WrapArcServer(server), listen_stats, config.listen.clone());
+        let mut runtime = ListenQuicRuntime::new(
+            WrapArcServer(server),
+            listen_stats,
+            config.listen.clone(),
+            config.udp_payload_max_size,
+        );
         runtime.run_all_instances(
             config.listen_in_worker,
             &self.quinn_config,