From ffb6854c5862eeae18dcef61ff1a342ab16d0918 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 16 Aug 2021 00:19:44 +0100 Subject: [PATCH] check mtu Signed-off-by: Ian Jackson --- PROTOCOL | 5 +++-- docs/settings.rst | 2 +- src/bin/client.rs | 2 ++ src/bin/server.rs | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/PROTOCOL b/PROTOCOL index 4c813b9..eea9c5b 100644 --- a/PROTOCOL +++ b/PROTOCOL @@ -22,8 +22,9 @@ Client form parameters (multipart/form-data): token target_requests_outstanding http_timeout - max_batch_down } not supplied - max_batch_up } by older clients + mtu } not supplied + max_batch_down } by older + max_batch_up } clients d data (SLIP format, with SLIP_ESC and `-' swapped) diff --git a/docs/settings.rst b/docs/settings.rst index f900673..7b44350 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -149,7 +149,7 @@ sections. ``mtu`` Of virtual interface. - Must match exactly at each end - *this is not checked*. + Must match exactly at each end (checked). [``1500`` (bytes)] diff --git a/src/bin/client.rs b/src/bin/client.rs index d73eceb..e89eead 100644 --- a/src/bin/client.rs +++ b/src/bin/client.rs @@ -65,11 +65,13 @@ fn submit_request<'r, 'c:'r, C:HCC>( {} {} {} + {} {}"#), &c.ic.link.client, token, c.ic.target_requests_outstanding, show_timeout, + c.ic.mtu, c.ic.max_batch_down, c.ic.max_batch_up, ); diff --git a/src/bin/server.rs b/src/bin/server.rs index cf0eec1..4900e97 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -319,6 +319,11 @@ async fn run_client(ic: Arc, let server, client = Duration::from_secs(meta.need_parse()?); } + meta!{ + mtu, ( != ), client, + let server, client: u32 = meta.parse()?.unwrap_or(server); + } + meta!{ max_batch_down, (), min(client, server), let server, client: u32 = meta.parse()?.unwrap_or(server); -- 2.30.2