From f2fe353cc829f2074d63ebba9bb3b25e5ceb20af Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 8 May 2020 16:23:38 +0000 Subject: tcp: avoid rcv wnd less than mss Type: fix Signed-off-by: Florin Coras Change-Id: I84ec1c91a3a7b2195aad58923fa6f17f551444cb --- src/vnet/tcp/tcp_output.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index a21c012b5b7..6bcca31ca77 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -143,13 +143,11 @@ tcp_update_rcv_wnd (tcp_connection_t * tc) wnd = available_space; } - /* Make sure we have a multiple of rcv_wscale */ + /* Make sure we have a multiple of 1 << rcv_wscale. We round up to + * avoid advertising a window less than mss which could happen if + * 1 << rcv_wscale < mss */ if (wnd && tc->rcv_wscale) - { - wnd &= ~((1 << tc->rcv_wscale) - 1); - if (wnd == 0) - wnd = 1 << tc->rcv_wscale; - } + wnd = round_pow2 (wnd, 1 << tc->rcv_wscale); tc->rcv_wnd = clib_min (wnd, TCP_WND_MAX << tc->rcv_wscale); } -- cgit 1.2.3-korg