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

tcp_monitor: start_monitor return OK when connect closed by peer 

If TCP_FIN is received before the user calls accept, the later accept will
report an error, then the previously received data cannot be read.

operation flow:
tcp_server_listen -> tcp_client_connect -> tcp_client_send ->
tcp_client_close -> tcp_server_accept(fix this error) -> tcp_server_recv

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2023-04-17 22:01:32 +08:00 committed by Petro Karashchenko
parent f7cfcd4e95
commit 646c41dced
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/tcp/tcp_monitor.c
View File

@ -271,6 +271,18 @@ int tcp_start_monitor(FAR struct socket *psock)
tcp_shutdown_monitor(conn, TCP_CLOSE); tcp_shutdown_monitor(conn, TCP_CLOSE);
/* If the peer close the connection before we call accept,
* in order to allow user to read the readahead data,
* return OK.
*/
if (conn->tcpstateflags == TCP_CLOSED ||
conn->tcpstateflags == TCP_LAST_ACK)
{
net_unlock();
return OK;
}
/* And return -ENOTCONN to indicate the monitor was not started /* And return -ENOTCONN to indicate the monitor was not started
* because the socket was already disconnected. * because the socket was already disconnected.
*/ */