This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7b847868c1bc9cab16db8ad658f2e51f00a9caba Author: wenquan1 <[email protected]> AuthorDate: Fri Sep 26 16:00:33 2025 +0800 net/socket: set _SF_CONNECTING flag when socket connect Fixing the problems caused by abnormal repair status Signed-off-by: wenquan1 <[email protected]> --- net/rpmsg/rpmsg_sockif.c | 1 + net/socket/connect.c | 9 ++++++++- net/tcp/tcp_connect.c | 1 + net/tcp/tcp_monitor.c | 1 + net/usrsock/usrsock_event.c | 1 + net/vsock/vsock_sockif.c | 4 +++- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c index f6a5b5a3af2..58108266f7f 100644 --- a/net/rpmsg/rpmsg_sockif.c +++ b/net/rpmsg/rpmsg_sockif.c @@ -362,6 +362,7 @@ static int rpmsg_socket_ept_cb(FAR struct rpmsg_endpoint *ept, conn->cred.uid = head->uid; conn->cred.gid = head->gid; + conn->sconn.s_flags &= ~_SF_CONNECTING; conn->sconn.s_flags |= _SF_CONNECTED; _SO_CONN_SETERRNO(conn, OK); diff --git a/net/socket/connect.c b/net/socket/connect.c index 9b1f79f8493..1ee82e4deff 100644 --- a/net/socket/connect.c +++ b/net/socket/connect.c @@ -119,6 +119,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr, socklen_t addrlen) { + FAR struct socket_conn_s *conn; int ret; /* Verify that the psock corresponds to valid, allocated socket */ @@ -143,13 +144,19 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr, return -EOPNOTSUPP; } + conn = psock->s_conn; + conn->s_flags |= _SF_CONNECTING; ret = psock->s_sockif->si_connect(psock, addr, addrlen); if (ret >= 0 && addr->sa_family != AF_UNSPEC) { - FAR struct socket_conn_s *conn = psock->s_conn; conn->s_flags |= _SF_CONNECTED; } + if (ret != -EINPROGRESS) + { + conn->s_flags &= ~_SF_CONNECTING; + } + return ret; } diff --git a/net/tcp/tcp_connect.c b/net/tcp/tcp_connect.c index ffe3e3116b3..3419929a85a 100644 --- a/net/tcp/tcp_connect.c +++ b/net/tcp/tcp_connect.c @@ -222,6 +222,7 @@ static uint32_t psock_connect_eventhandler(FAR struct net_driver_s *dev, * but not necessarily at any time later. */ + conn->sconn.s_flags &= ~_SF_CONNECTING; conn->sconn.s_flags |= (_SF_BOUND | _SF_CONNECTED); /* Indicate that the socket is no longer connected */ diff --git a/net/tcp/tcp_monitor.c b/net/tcp/tcp_monitor.c index 11b43e95675..d8b55aaa8ac 100644 --- a/net/tcp/tcp_monitor.c +++ b/net/tcp/tcp_monitor.c @@ -175,6 +175,7 @@ static uint32_t tcp_monitor_event(FAR struct net_driver_s *dev, /* Indicate that the socket is now connected */ + conn->sconn.s_flags &= ~_SF_CONNECTING; conn->sconn.s_flags |= (_SF_BOUND | _SF_CONNECTED); conn->sconn.s_flags &= ~_SF_CLOSED; } diff --git a/net/usrsock/usrsock_event.c b/net/usrsock/usrsock_event.c index 5e1da1340c5..18c30e28535 100644 --- a/net/usrsock/usrsock_event.c +++ b/net/usrsock/usrsock_event.c @@ -74,6 +74,7 @@ int usrsock_event(FAR struct usrsock_conn_s *conn) if ((events & USRSOCK_EVENT_REQ_COMPLETE) || (events & USRSOCK_EVENT_SENDTO_READY)) { + conn->sconn.s_flags &= ~_SF_CONNECTING; conn->state = USRSOCK_CONN_STATE_READY; events |= USRSOCK_EVENT_CONNECT_READY; diff --git a/net/vsock/vsock_sockif.c b/net/vsock/vsock_sockif.c index 35b8d91cbd0..4fb690e3471 100644 --- a/net/vsock/vsock_sockif.c +++ b/net/vsock/vsock_sockif.c @@ -1139,6 +1139,7 @@ static int vsock_recv_connecting(FAR struct vsock_conn_s *conn, { case VIRTIO_VSOCK_OP_RESPONSE: vsockdbg("conn=%p, VSOCK_CONNECTED\n", conn); + conn->sconn.s_flags &= ~_SF_CONNECTING; conn->sconn.s_flags |= _SF_CONNECTED; vsock_notify(conn, VSOCK_NOTIFY_SEND); return 0; @@ -1153,6 +1154,7 @@ static int vsock_recv_connecting(FAR struct vsock_conn_s *conn, vsock_reset(conn, pkt); conn->sconn.s_error = ret; + conn->sconn.s_flags &= ~_SF_CONNECTING; vsock_notify(conn, VSOCK_NOTIFY_ERROR); return ret; } @@ -1245,6 +1247,7 @@ static int vsock_recv_listening(FAR struct vsock_conn_s *conn, vsockdbg("create conn=%p dst_port=%" PRIu32 "\n", newconn, hdr->dst_port); vsock_update_tx_credit(newconn, pkt); + newconn->sconn.s_flags &= ~_SF_CONNECTING; newconn->sconn.s_flags |= _SF_CONNECTED; vsock_insert_conn(newconn); vsock_notify(conn, VSOCK_NOTIFY_LISTEN); @@ -1714,7 +1717,6 @@ static int vsock_connect(FAR struct socket *psock, goto err_with_bind; } - conn->sconn.s_flags |= _SF_CONNECTING; if (_SS_ISNONBLOCK(conn->sconn.s_flags)) { ret = -EINPROGRESS;
