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

tcp: wait for 3-Way Handshare before accept() returns

Browse Source
This commit is contained in:
Simon Piriou 2017-05-14 09:08:32 -06:00 committed by Gregory Nutt
parent fa649df52e
commit 8dc7f6d79e
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/tcp/Kconfig
View File

@ -156,6 +156,13 @@ config NET_TCPBACKLOG
Incoming connections pend in a backlog until accept() is called. Incoming connections pend in a backlog until accept() is called.
The size of the backlog is selected when listen() is called. The size of the backlog is selected when listen() is called.
config NET_ACCEPT_ON_ACK
bool "accept() returns on TCP 3-Way Handshake completion"
default n
---help---
accept() returns after 3-Way Handshake is complete (SYN, SYN/ACK, ACK).
Without this flag it returns after SYN packet is received.
config NET_TCP_SPLIT config NET_TCP_SPLIT
bool "Enable packet splitting" bool "Enable packet splitting"
default n default n

20
net/tcp/tcp_input.c
View File

@ -185,6 +185,8 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
*/ */
conn->crefs = 1; conn->crefs = 1;
#ifndef CONFIG_NET_ACCEPT_ON_ACK
if (tcp_accept_connection(dev, conn, tmp16) != OK) if (tcp_accept_connection(dev, conn, tmp16) != OK)
{ {
/* No, then we have to give the connection back and drop the packet */ /* No, then we have to give the connection back and drop the packet */
@ -193,6 +195,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
tcp_free(conn); tcp_free(conn);
conn = NULL; conn = NULL;
} }
#endif
} }
if (!conn) if (!conn)
@ -464,6 +467,23 @@ found:
{ {
conn->tcpstateflags = TCP_ESTABLISHED; conn->tcpstateflags = TCP_ESTABLISHED;
#ifdef CONFIG_NET_ACCEPT_ON_ACK
if (tcp_accept_connection(dev, conn, tcp->destport) != OK)
{
/* No more listener for current port. We can free conn here
* because it has not been shared with upper layers yet as
* handshake is not complete
*/
nerr("Listen canceled while waiting for ACK on port %d\n",
tcp->destport);
conn->crefs = 0;
tcp_free(conn);
conn = NULL;
goto drop;
}
#endif
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
conn->isn = tcp_getsequence(tcp->ackno); conn->isn = tcp_getsequence(tcp->ackno);
tcp_setsequence(conn->sndseq, conn->isn); tcp_setsequence(conn->sndseq, conn->isn);