You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/12/28 02:59:55 UTC

[incubator-nuttx] branch master updated: net/tcp(unbuffered): fixed an issue with unackseq calculation. Wrong unackseq calculation locked conn->tx_unacked at non-zero values even if all ACKs were received. Thus unbuffered psock_tcp_send() never completed.

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new e68ffb9  net/tcp(unbuffered): fixed an issue with unackseq calculation. Wrong unackseq calculation locked conn->tx_unacked at non-zero values even if all ACKs were received. Thus unbuffered psock_tcp_send() never completed.
e68ffb9 is described below

commit e68ffb9f994c7ef398278365ff93f9e17e0edb82
Author: Alexander Lunev <al...@mail.ru>
AuthorDate: Sun Oct 10 05:56:51 2021 +0300

    net/tcp(unbuffered): fixed an issue with unackseq calculation.
    Wrong unackseq calculation locked conn->tx_unacked at non-zero values
    even if all ACKs were received. Thus unbuffered psock_tcp_send() never completed.
---
 net/tcp/tcp_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 2975c0d..c37caf7 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -694,7 +694,7 @@ found:
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
       unackseq = conn->sndseq_max;
 #else
-      unackseq = tcp_addsequence(conn->sndseq, conn->tx_unacked);
+      unackseq = tcp_getsequence(conn->sndseq);
 #endif
 
       /* Get the sequence number of that has just been acknowledged by this