aboutsummaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-27 19:50:35 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-27 19:50:35 +0000
commit6fe64a18861e4e35d0906fa9236498d125d33262 (patch)
tree84593559b23d580c9330f7c2ca516069a166c789 /nuttx/net
parentfcbad8c27f9207306bbc31ca1471c21f780abe0a (diff)
downloadpx4-firmware-6fe64a18861e4e35d0906fa9236498d125d33262.tar.gz
px4-firmware-6fe64a18861e4e35d0906fa9236498d125d33262.tar.bz2
px4-firmware-6fe64a18861e4e35d0906fa9236498d125d33262.zip
Add support for the Atollic Pro toolchain; Change extension .ihx to .hex to be better compatible with most of the rest of the world
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4431 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/uip/uip_tcpinput.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/nuttx/net/uip/uip_tcpinput.c b/nuttx/net/uip/uip_tcpinput.c
index 5dc3435cc..593f55b55 100644
--- a/nuttx/net/uip/uip_tcpinput.c
+++ b/nuttx/net/uip/uip_tcpinput.c
@@ -179,13 +179,9 @@ void uip_tcpinput(struct uip_driver_s *dev)
/* The connection structure was successfully allocated. Now see if
* there is an application waiting to accept the connection (or at
* least queue it it for acceptance).
- *
- * TCP state machine should move to the ESTABLISHED state only after
- * it has received ACK from the host.
*/
conn->crefs = 1;
-
if (uip_accept(dev, conn, tmp16) != OK)
{
/* No, then we have to give the connection back */
@@ -194,6 +190,15 @@ void uip_tcpinput(struct uip_driver_s *dev)
uip_tcpfree(conn);
conn = NULL;
}
+ else
+ {
+ /* TCP state machine should move to the ESTABLISHED state only after
+ * it has received ACK from the host. This needs to be investigated
+ * further.
+ */
+
+ conn->tcpstateflags = UIP_ESTABLISHED;
+ }
}
if (!conn)