summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-10-17 09:49:33 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-10-17 09:49:33 -0600
commit60bff805a236dc7e599d546fd9cef04246bfc078 (patch)
treeaf5618b9c948066046eaf8e56dd03b5aaf2719c9
parent17d0026e6ad6b4718497acbda965393bad6e4d2e (diff)
downloadnuttx-60bff805a236dc7e599d546fd9cef04246bfc078.tar.gz
nuttx-60bff805a236dc7e599d546fd9cef04246bfc078.tar.bz2
nuttx-60bff805a236dc7e599d546fd9cef04246bfc078.zip
Move tcp connection into SYN_RCVD state after aception instead of bypassing and moving directly into ESTABLISHED. From Max Holtzberg.
-rw-r--r--nuttx/ChangeLog3
-rw-r--r--nuttx/net/uip/uip_tcpinput.c9
2 files changed, 3 insertions, 9 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 03f4d57d0..7760eecbf 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5785,4 +5785,7 @@
* include/nuttx/net/uip/uip-tcp.h, net/send.c, uip/uip_tcpconn.c, and
uip/uip_tcpinput.c: Change how the inital minimum MSS is calculated.
Max Holtzberg (2013-10-17).
+ * net/uip/uip_tcpinput.c: Move tcp connection into SYN_RCVD state
+ after aception instead of bypassing and moving directly into ESTABLISHED.
+ From Max Holtzber (2013-10-17).
diff --git a/nuttx/net/uip/uip_tcpinput.c b/nuttx/net/uip/uip_tcpinput.c
index 54965918c..815db4129 100644
--- a/nuttx/net/uip/uip_tcpinput.c
+++ b/nuttx/net/uip/uip_tcpinput.c
@@ -190,15 +190,6 @@ 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)