Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add MTU config for QUIC #567

Merged
merged 2 commits into from
Aug 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lightyear/src/transport/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ pub const LOCAL_SOCKET: SocketAddr = SocketAddr::new(
/// See: <https://gafferongames.com/post/packet_fragmentation_and_reassembly/>
pub(crate) const MTU: usize = 1472;

/// Minimum MTU used by QUIC. Any packets bigger than this will error with TooLarge
/// There is MTU Discovery to potentially allow bigger MTUs, and this is the minimum
/// the discovery will start from.
pub(crate) const MIN_MTU: usize = 1300;

pub(crate) type BoxedSender = Box<dyn PacketSender + Send + Sync>;
pub(crate) type BoxedReceiver = Box<dyn PacketReceiver + Send + Sync>;

Expand Down
17 changes: 13 additions & 4 deletions lightyear/src/transport/webtransport/client_native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ use crate::client::io::transport::{ClientTransportBuilder, ClientTransportEnum};
use crate::client::io::{ClientIoEvent, ClientIoEventReceiver, ClientNetworkEventSender};
use crate::transport::error::{Error, Result};
use crate::transport::io::IoState;
use crate::transport::{BoxedReceiver, BoxedSender, PacketReceiver, PacketSender, Transport, MTU};
use crate::transport::{
BoxedReceiver, BoxedSender, PacketReceiver, PacketSender, Transport, MIN_MTU, MTU,
};

pub(crate) struct WebTransportClientSocketBuilder {
pub(crate) client_addr: SocketAddr,
Expand All @@ -33,18 +35,25 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder {
Option<ClientIoEventReceiver>,
Option<ClientNetworkEventSender>,
)> {
let (to_server_sender, mut to_server_receiver) = mpsc::unbounded_channel();
let (to_server_sender, mut to_server_receiver) = mpsc::unbounded_channel::<Box<[u8]>>();
let (from_server_sender, from_server_receiver) = mpsc::unbounded_channel();
// channels used to cancel the task
let (close_tx, close_rx) = async_channel::bounded(1);
// channels used to check the status of the io task
let (event_tx, event_rx) = async_channel::bounded(1);

IoTaskPool::get().spawn(Compat::new(async move {
let config = ClientConfig::builder()
let mut config = ClientConfig::builder()
.with_bind_address(self.client_addr)
.with_no_cert_validation()
.build();
let mut quic_config = wtransport::quinn::TransportConfig::default();
quic_config
.initial_mtu(MIN_MTU as u16)
.min_mtu(MIN_MTU as u16);
config.quic_config_mut().transport_config(
Arc::new(quic_config)
);
let server_url = format!("https://{}", self.server_addr);
info!(
"Connecting to server via webtransport at server url: {}",
Expand Down Expand Up @@ -110,7 +119,7 @@ impl ClientTransportBuilder for WebTransportClientSocketBuilder {
if let Some(msg) = to_server_receiver.recv().await {
trace!("send datagram to server: {:?}", &msg);
connection_send.send_datagram(msg).unwrap_or_else(|e| {
error!("send_datagram error: {:?}", e);
error!("send_datagram via webtransport error: {:?}", e);
});
}
}
Expand Down
13 changes: 11 additions & 2 deletions lightyear/src/transport/webtransport/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ use crate::server::io::transport::{ServerTransportBuilder, ServerTransportEnum};
use crate::server::io::{ServerIoEvent, ServerIoEventReceiver, ServerNetworkEventSender};
use crate::transport::error::Result;
use crate::transport::io::IoState;
use crate::transport::{BoxedReceiver, BoxedSender, PacketReceiver, PacketSender, Transport, MTU};
use crate::transport::{
BoxedReceiver, BoxedSender, PacketReceiver, PacketSender, Transport, MIN_MTU, MTU,
};

pub(crate) struct WebTransportServerSocketBuilder {
pub(crate) server_addr: SocketAddr,
Expand Down Expand Up @@ -54,10 +56,17 @@ impl ServerTransportBuilder for WebTransportServerSocketBuilder {
from_client_receiver,
};

let config = ServerConfig::builder()
let mut config = ServerConfig::builder()
.with_bind_address(self.server_addr)
.with_identity(&self.certificate)
.build();
let mut quic_config = wtransport::quinn::TransportConfig::default();
quic_config
.initial_mtu(MIN_MTU as u16)
.min_mtu(MIN_MTU as u16);
config
.quic_config_mut()
.transport_config(Arc::new(quic_config));
// need to run this with Compat because it requires the tokio reactor
IoTaskPool::get()
.spawn(Compat::new(async move {
Expand Down
Loading