michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: sockets: Return EINVAL when an accept call is unblocked

Browse source 
Under Linux when you shutdown a socket which is blocked on
an accept call the error code returned by accept is EINVAL.
Modify the socket code to be inline with this behaviour.

Signed-off-by: Léonard Bise <leonard.bise@gmail.com>
This commit is contained in:
Léonard Bise 2020-06-15 09:19:33 +02:00 • committed by Jukka Rissanen
commit 8e4faab30a
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsys/net/lib/sockets/sockets.c
View file

@ -465,7 +465,21 @@ int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
ctx = k_fifo_get(&parent->accept_q, timeout); ctx = k_fifo_get(&parent->accept_q, timeout);
if (ctx == NULL) { if (ctx == NULL) {
z_free_fd(fd); z_free_fd(fd);
errno = EAGAIN; if (K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
/* For non-blocking sockets return EAGAIN because it
* just means the fifo is empty at this time
*/
errno = EAGAIN;
} else {
/* For blocking sockets return EINVAL because it means
* the socket was closed while we were waiting for
* connections. This is the same error code returned
* under Linux when calling shutdown on a blocked accept
* call
*/
errno = EINVAL;
}
return -1; return -1;
} }