extmod/network_ninaw10: Fix select flags handling in socket poll.

iabdalkader · dpgeorge · commit 2fda94c28629 · 2023-10-27T15:49:17.000+11:00
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 &lt;i.abdalkader@gmail.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,8 @@ STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {`
`92`	`92`	`// remove from poll list on error.`
`93`	`93`	`socket->callback = MP_OBJ_NULL;`
`94`	`94`	`mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket);`
`95`		`- } else if (flags) {`
	`95`	`+ } else if (flags & SOCKET_POLL_RD) {`
`96`	`96`	`mp_call_function_1(socket->callback, MP_OBJ_FROM_PTR(socket));`
`97`		`- if (flags & SOCKET_POLL_ERR) {`
`98`		`- // remove from poll list on error.`
`99`		`- socket->callback = MP_OBJ_NULL;`
`100`		`- mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket);`
`101`		`- }`
`102`	`97`	`}`
`103`	`98`	`}`
`104`	`99`	`}`
`@@ -451,7 +446,7 @@ STATIC int network_ninaw10_socket_poll(mod_network_socket_obj_t *socket, uint32_`
`451`	`446`	`}`
`452`	`447`	`mp_uint_t start = mp_hal_ticks_ms();`
`453`	`448`	`for (; !(flags & rwf); mp_hal_delay_ms(5)) {`
`454`		`- if (nina_socket_poll(socket->fileno, &flags) < 0 \|\| (flags & SOCKET_POLL_ERR)) {`
	`449`	`+ if (nina_socket_poll(socket->fileno, &flags) < 0) {`
`455`	`450`	`nina_socket_errno(_errno);`
`456`	`451`	`debug_printf("socket_poll(%d) -> errno %d flags %d\n", socket->fileno, *_errno, flags);`
`457`	`452`	`return -1;`