diff options
| author | iabdalkader <i.abdalkader@gmail.com> | 2023-10-23 12:08:17 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-10-27 15:49:17 +1100 |
| commit | 2fda94c28629f7c12dcab931b2bf4cc0f9c8f734 (patch) | |
| tree | 8a9a56cb8b9b9a197739324974faa70a015cdbad | |
| parent | b6c369a396d259ab237acec5570392a96d3f443f (diff) | |
extmod/network_ninaw10: Fix select flags handling in socket poll.
The flags returned from `select()` were misinterpreted to mean an error had
occurred for the socket, when it's actually just an exceptional condition
for the socket, such as OOB data.
Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
| -rw-r--r-- | extmod/network_ninaw10.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c index 399d02cd6..264eb1437 100644 --- a/extmod/network_ninaw10.c +++ b/extmod/network_ninaw10.c @@ -92,13 +92,8 @@ STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) { // remove from poll list on error. socket->callback = MP_OBJ_NULL; mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket); - } else if (flags) { + } else if (flags & SOCKET_POLL_RD) { mp_call_function_1(socket->callback, MP_OBJ_FROM_PTR(socket)); - if (flags & SOCKET_POLL_ERR) { - // remove from poll list on error. - socket->callback = MP_OBJ_NULL; - mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket); - } } } } @@ -451,7 +446,7 @@ STATIC int network_ninaw10_socket_poll(mod_network_socket_obj_t *socket, uint32_ } mp_uint_t start = mp_hal_ticks_ms(); for (; !(flags & rwf); mp_hal_delay_ms(5)) { - if (nina_socket_poll(socket->fileno, &flags) < 0 || (flags & SOCKET_POLL_ERR)) { + if (nina_socket_poll(socket->fileno, &flags) < 0) { nina_socket_errno(_errno); debug_printf("socket_poll(%d) -> errno %d flags %d\n", socket->fileno, *_errno, flags); return -1; |