Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-28 12:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Eliminate uip_outstanding()

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3134 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-11-26 15:54:48 +00:00
parent 8c9fbe1199
commit c7ef01622b
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/net/uip/uip-tcp.h
View file

@ -6,7 +6,7 @@
* of C macros that are used by uIP programs as well as internal uIP
* structures, TCP/IP header structures and function declarations.
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This logic was leveraged from uIP which also has a BSD-style license:
@ -379,10 +379,6 @@ extern int uip_listen(struct uip_conn *conn);
extern int uip_unlisten(struct uip_conn *conn);
/* Check if a connection has outstanding (i.e., unacknowledged) data */
#define uip_outstanding(conn) ((conn)->len)
/* Access to TCP read-ahead buffers */
#if CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0

6
net/uip/uip_tcpinput.c
View file

@ -2,7 +2,7 @@
* net/uip/uip_tcpinput.c
* Handling incoming TCP input
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Adapted for NuttX from logic in uIP which also has a BSD-like license:
@ -326,7 +326,7 @@ found:
* retransmission timer.
*/
if ((pbuf->flags & TCP_ACK) && uip_outstanding(conn))
if ((pbuf->flags & TCP_ACK) != 0 && conn->len > 0)
{
uint32_t seqno;
uint32_t ackno;
@ -533,7 +533,7 @@ found:
if (pbuf->flags & TCP_FIN && !(conn->tcpstateflags & UIP_STOPPED))
{
if (uip_outstanding(conn))
if (conn->len > 0)
{
goto drop;
}

4
net/uip/uip_tcptimer.c
View file

@ -2,7 +2,7 @@
* net/uip/uip_tcptimer.c
* Poll for the availability of TCP TX data
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Adapted for NuttX from logic in uIP which also has a BSD-like license:
@ -133,7 +133,7 @@ void uip_tcptimer(struct uip_driver_s *dev, struct uip_conn *conn, int hsec)
* retransmit.
*/
if (uip_outstanding(conn))
if (conn->len > 0)
{
/* The connection has outstanding data */