mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp32/modsocket: Raise EAGAIN when accept fails in non-blocking mode. 

EAGAIN should be for pure non-blocking mode and ETIMEDOUT for when there is
a finite (but non-zero) timeout enabled.
This commit is contained in:
Damien George 2019-05-28 17:43:00 +10:00
parent 8c9758ff2e
commit 883e987b90
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/esp32/modsocket.c
View File

@ -253,7 +253,13 @@ STATIC mp_obj_t socket_accept(const mp_obj_t arg0) {
if (errno != EAGAIN) exception_from_errno(errno); if (errno != EAGAIN) exception_from_errno(errno);
check_for_exceptions(); check_for_exceptions();
} }
if (new_fd < 0) mp_raise_OSError(MP_ETIMEDOUT); if (new_fd < 0) {
if (self->retries == 0) {
mp_raise_OSError(MP_EAGAIN);
} else {
mp_raise_OSError(MP_ETIMEDOUT);
}
}
// create new socket object // create new socket object
socket_obj_t *sock = m_new_obj_with_finaliser(socket_obj_t); socket_obj_t *sock = m_new_obj_with_finaliser(socket_obj_t);