OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net/tcp/tcp_send_buffered.c: Fix assertion crash when window size is zero.

This commit is contained in:
Gregory Nutt 2019-02-14 08:39:16 -06:00
parent 350295d009
commit 359753adee
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/tcp/tcp_send_buffered.c
View File

@ -759,13 +759,14 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
* asked to retransmit data, (3) the connection is still healthy, and (4) * asked to retransmit data, (3) the connection is still healthy, and (4)
* the outgoing packet is available for our use. In this case, we are * the outgoing packet is available for our use. In this case, we are
* now free to send more data to receiver -- UNLESS the buffer contains * now free to send more data to receiver -- UNLESS the buffer contains
* unprocessed incoming data. In that event, we will have to wait for the * unprocessed incoming data or window size is zero. In that event, we
* next polling cycle. * will have to wait for the next polling cycle.
*/ */
if ((conn->tcpstateflags & TCP_ESTABLISHED) && if ((conn->tcpstateflags & TCP_ESTABLISHED) &&
(flags & (TCP_POLL | TCP_REXMIT)) && (flags & (TCP_POLL | TCP_REXMIT)) &&
!(sq_empty(&conn->write_q))) !(sq_empty(&conn->write_q)) &&
conn->winsize > 0)
{ {
/* Check if the destination IP address is in the ARP or Neighbor /* Check if the destination IP address is in the ARP or Neighbor
* table. If not, then the send won't actually make it out... it * table. If not, then the send won't actually make it out... it
@ -803,8 +804,9 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
sndlen = conn->winsize; sndlen = conn->winsize;
} }
ninfo("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n", ninfo("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u mss=%u winsize=%u\n",
wrb, TCP_WBPKTLEN(wrb), TCP_WBSENT(wrb), sndlen); wrb, TCP_WBPKTLEN(wrb), TCP_WBSENT(wrb), sndlen, conn->mss,
conn->winsize);
/* Set the sequence number for this segment. If we are /* Set the sequence number for this segment. If we are
* retransmitting, then the sequence number will already * retransmitting, then the sequence number will already