djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/modusocket: Fix polling of closed sockets. 

Unbound sockets in NEW state should return HUP|WR when polled, and return
NVAL when in CLOSED state.
This commit is contained in:
iabdalkader 2022-06-07 17:36:28 +02:00 committed by Damien George
parent 70bf6ab6fb
commit a4eef90b22
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extmod/modusocket.c
View File

@ -501,14 +501,19 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
if (self->nic != MP_OBJ_NULL) {
self->nic_type->close(self);
self->nic = MP_OBJ_NULL;
self->state = MOD_NETWORK_SS_CLOSED;
}
self->state = MOD_NETWORK_SS_CLOSED;
return 0;
}
if (self->nic == MP_OBJ_NULL) {
if (request == MP_STREAM_POLL) {
// New sockets are writable and not connected.
return MP_STREAM_POLL_HUP | MP_STREAM_POLL_WR;
if (self->state == MOD_NETWORK_SS_NEW) {
// New sockets are writable and not connected.
return MP_STREAM_POLL_HUP | MP_STREAM_POLL_WR;
} else if (self->state == MOD_NETWORK_SS_CLOSED) {
// Closed socket, return invalid.
return MP_STREAM_POLL_NVAL;
}
}
*errcode = MP_EINVAL;
return MP_STREAM_ERROR;