bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: sockets: Handle EINTR return from k_poll()

Browse Source 
In 90b471fe4, there was a change to make k_poll() return EINTR error
if it was cancelled with k_fifo_cancel_wait(). Handle this change, or
otherwise sockets EOF handling was broken.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2017-11-16 20:07:50 +02:00 committed by Anas Nashif
parent 3689107b59
commit 21f31e90ec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subsys/net/lib/sockets/sockets.c
View File

@ -303,7 +303,8 @@ static inline ssize_t zsock_recv_stream(struct net_context *ctx,
}
res = _k_fifo_wait_non_empty(&ctx->recv_q, timeout);
if (res && res != -EAGAIN) {
/* EAGAIN when timeout expired, EINTR when cancelled */
if (res && res != -EAGAIN && res != -EINTR) {
errno = -res;
return -1;
}