From 18b91b28417ef79f3b4e45bf2e46c6fdc7a56cf4 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Mon, 12 Nov 2018 21:01:05 +0100 Subject: [PATCH] Revert "tcp_recved: check for overflow and warn about too big values" This reverts commit 684adaca2990b713b1708e46bda150f9a6e3c297. It changes the behaviour to assert for applications running good so far. Signed-off-by: Simon Goldschmidt --- src/core/tcp.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/core/tcp.c b/src/core/tcp.c index 1f91d24b..74759a49 100644 --- a/src/core/tcp.c +++ b/src/core/tcp.c @@ -971,7 +971,6 @@ void tcp_recved(struct tcp_pcb *pcb, u16_t len) { u32_t wnd_inflation; - tcpwnd_size_t rcv_wnd; LWIP_ASSERT_CORE_LOCKED(); @@ -981,8 +980,10 @@ tcp_recved(struct tcp_pcb *pcb, u16_t len) LWIP_ASSERT("don't call tcp_recved for listen-pcbs", pcb->state != LISTEN); - rcv_wnd = pcb->rcv_wnd + len; - if (rcv_wnd < pcb->rcv_wnd || (len != 0 && rcv_wnd == pcb->rcv_wnd)) { + pcb->rcv_wnd = (tcpwnd_size_t)(pcb->rcv_wnd + len); + if (pcb->rcv_wnd > TCP_WND_MAX(pcb)) { + pcb->rcv_wnd = TCP_WND_MAX(pcb); + } else if (pcb->rcv_wnd == 0) { /* rcv_wnd overflowed */ if (TCP_STATE_IS_CLOSING(pcb->state)) { /* In passive close, we allow this, since the FIN bit is added to rcv_wnd @@ -992,12 +993,6 @@ tcp_recved(struct tcp_pcb *pcb, u16_t len) } else { LWIP_ASSERT("tcp_recved: len wrapped rcv_wnd\n", 0); } - } else if (rcv_wnd <= TCP_WND_MAX(pcb)) { - pcb->rcv_wnd = rcv_wnd; - } else { - LWIP_ASSERT("tcp_recved: len overflowed TCP_WND_MAX", - rcv_wnd <= TCP_WND_MAX(pcb)); - pcb->rcv_wnd = TCP_WND_MAX(pcb); } wnd_inflation = tcp_update_rcv_ann_wnd(pcb);