sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/tcp(unbuffered): removed excessive overwrites of conn->sndseq

Browse Source 
(conn->sndseq was updated in multiple places that was unreasonable and complicated).
This commit is contained in:
Alexander Lunev 2021-12-28 23:18:55 +03:00 committed by Xiang Xiao
parent a698100de3
commit 2b60468845
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/tcp/tcp_input.c
View File

@ -684,8 +684,9 @@ found:
{ {
uint32_t unackseq; uint32_t unackseq;
uint32_t ackseq; uint32_t ackseq;
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
uint32_t sndseq; uint32_t sndseq;
#endif
/* The next sequence number is equal to the current sequence /* The next sequence number is equal to the current sequence
* number (sndseq) plus the size of the outstanding, unacknowledged * number (sndseq) plus the size of the outstanding, unacknowledged
* data (tx_unacked). * data (tx_unacked).
@ -737,6 +738,7 @@ found:
} }
} }
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS
/* Update sequence number to the unacknowledge sequence number. If /* Update sequence number to the unacknowledge sequence number. If
* there is still outstanding, unacknowledged data, then this will * there is still outstanding, unacknowledged data, then this will
* be beyond ackseq. * be beyond ackseq.
@ -751,6 +753,7 @@ found:
(uint32_t)conn->tx_unacked); (uint32_t)conn->tx_unacked);
tcp_setsequence(conn->sndseq, ackseq); tcp_setsequence(conn->sndseq, ackseq);
} }
#endif
/* Do RTT estimation, unless we have done retransmissions. */ /* Do RTT estimation, unless we have done retransmissions. */

15
net/tcp/tcp_send_unbuffered.c
View File

@ -321,8 +321,6 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
if ((flags & TCP_NEWDATA) == 0 && pstate->snd_sent < pstate->snd_buflen) if ((flags & TCP_NEWDATA) == 0 && pstate->snd_sent < pstate->snd_buflen)
{ {
uint32_t seqno;
/* Get the amount of data that we can send in the next packet */ /* Get the amount of data that we can send in the next packet */
uint32_t sndlen = pstate->snd_buflen - pstate->snd_sent; uint32_t sndlen = pstate->snd_buflen - pstate->snd_sent;
@ -336,19 +334,6 @@ static uint16_t tcpsend_eventhandler(FAR struct net_driver_s *dev,
if ((pstate->snd_sent - pstate->snd_acked + sndlen) < conn->snd_wnd) if ((pstate->snd_sent - pstate->snd_acked + sndlen) < conn->snd_wnd)
{ {
/* Set the sequence number for this packet. NOTE: The network
* updates sndseq on receipt of ACK *before* this function is
* called. In that case sndseq will point to the next
* unacknowledged byte (which might have already been sent). We
* will overwrite the value of sndseq here before the packet is
* sent.
*/
seqno = pstate->snd_sent + pstate->snd_isn;
ninfo("SEND: sndseq %08" PRIx32 "->%08" PRIx32 "\n",
tcp_getsequence(conn->sndseq), seqno);
tcp_setsequence(conn->sndseq, seqno);
#ifdef NEED_IPDOMAIN_SUPPORT #ifdef NEED_IPDOMAIN_SUPPORT
/* If both IPv4 and IPv6 support are enabled, then we will need to /* If both IPv4 and IPv6 support are enabled, then we will need to
* select which one to use when generating the outgoing packet. * select which one to use when generating the outgoing packet.