You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/01/29 05:46:06 UTC
[nuttx] branch master updated: Revert "socket:return -EAGAIN if timeout happends in psock_tcp_send"
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang 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 85a8249821 Revert "socket:return -EAGAIN if timeout happends in psock_tcp_send"
85a8249821 is described below
commit 85a82498212b226fb197c6b4de18c52e5c898e52
Author: chao an <an...@xiaomi.com>
AuthorDate: Sun Jan 29 11:34:11 2023 +0800
Revert "socket:return -EAGAIN if timeout happends in psock_tcp_send"
This reverts commit fbe641a9164ee04919f172a712f3845e47263d7d.
This issue already fixed by below change:
| commit 715785245c461eb696c181b0e6d09b400f20d0c0
| Author: chao an <an...@xiaomi.com>
| Date: Mon Jan 16 12:37:44 2023 +0800
|
| net/tcp: fix potential busy loop in tcp_send_buffered.c
|
| if the wrbuffer does not have enough space to send the rest of
| the data, then the send function will loop infinitely in nonblock
| mode, add send timeout check to avoid this issue.
|
| Signed-off-by: chao an <an...@xiaomi.com>
Signed-off-by: chao an <an...@xiaomi.com>
---
net/tcp/tcp_send_buffered.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 546d429809..9f095e69f5 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -1551,12 +1551,6 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
{
iob_free_chain(iob);
}
- else
- {
- nerr("ERROR: no IOB available\n");
- ret = -EAGAIN;
- goto errout_with_lock;
- }
}
/* Dump I/O buffer chain */