This is an automated email from the ASF dual-hosted git repository.
jiuzhudong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new c5bb75441ce net/tcp: modify the return value when dev is down in
tcp_pollsetup
c5bb75441ce is described below
commit c5bb75441ce1c48f6871f04aba59036894aa5b46
Author: wangchen <[email protected]>
AuthorDate: Mon Aug 26 14:18:04 2024 +0800
net/tcp: modify the return value when dev is down in tcp_pollsetup
when dev is down, tcp_pollsetup returns the value 'OK' and sets the
connection status to 'down' and eventset to POLLERR & POLLUP
Signed-off-by: wangchen <[email protected]>
---
net/tcp/tcp_netpoll.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index f31077bcf55..75ecb86649f 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -238,6 +238,28 @@ int tcp_pollsetup(FAR struct socket *psock, FAR struct
pollfd *fds)
}
}
+ /* If a network device is already associated with this connection but
+ * either the device pointer is not valid anymore or the interface is not
+ * up, report the condition immediately and wake up the waiter:
+ *
+ * - Set per-connection socket error to ENETDOWN so that the application
+ * can retrieve the cause via getsockopt(SO_ERROR).
+ * - Notify poll() with POLLERR|POLLHUP to return without arming any
+ * further TCP callbacks.
+ *
+ * Rationale: there is no point in registering poll callbacks when the
+ * underlying interface is down. This mirrors the error paths elsewhere in
+ * the TCP stack and provides a prompt, deterministic wake-up.
+ */
+
+ if (conn->dev &&
+ !(netdev_verify(conn->dev) && IFF_IS_UP(conn->dev->d_flags)))
+ {
+ _SO_CONN_SETERRNO(conn, ENETDOWN);
+ eventset |= POLLERR | POLLHUP;
+ goto notify;
+ }
+
/* Allocate a TCP/IP callback structure */
cb = tcp_callback_alloc(conn);
@@ -356,6 +378,13 @@ int tcp_pollsetup(FAR struct socket *psock, FAR struct
pollfd *fds)
/* Check if any requested events are already in effect */
+notify:
+
+ /* At this point, eventset contains any immediate conditions discovered
+ * during setup (e.g., data already available, write possible, or an early
+ * error such as ENETDOWN above). Propagate these to the poller now.
+ */
+
poll_notify(&fds, 1, eventset);
errout_with_lock:
