diff options
| author | Jon Bjarni Bjarnason <jbbjarnason@gmail.com> | 2022-02-16 11:44:17 -0500 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-04-11 15:26:47 +1000 |
| commit | 919f696ad254bcc39effe7ce7fddae8cf406c954 (patch) | |
| tree | 38a132ffc829eb7888009f72e547ecf2d30058af /extmod/modusocket.c | |
| parent | d3d862769ad9f1317702b921dda1912d9a673948 (diff) | |
extmod/modusocket: Implement optional socket.listen backlog argument.
This follows the CPython change: https://bugs.python.org/issue21455
Socket listen backlog defaults to 2 if not given, based on most bare metal
targets not having many resources for a large backlog. On UNIX it defaults
to SOMAXCONN or 128, whichever is less.
Diffstat (limited to 'extmod/modusocket.c')
| -rw-r--r-- | extmod/modusocket.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extmod/modusocket.c b/extmod/modusocket.c index b6bab72e7..955ff4fc0 100644 --- a/extmod/modusocket.c +++ b/extmod/modusocket.c @@ -116,9 +116,9 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); -// method socket.listen(backlog) -STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog) { - mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); +// method socket.listen([backlog]) +STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { + mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); if (self->nic == MP_OBJ_NULL) { // not connected @@ -126,14 +126,20 @@ STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog) { mp_raise_OSError(MP_ENOTCONN); } + mp_int_t backlog = 2; + if (n_args > 1) { + backlog = mp_obj_get_int(args[1]); + backlog = (backlog < 0) ? 0 : backlog; + } + int _errno; - if (self->nic_type->listen(self, mp_obj_get_int(backlog), &_errno) != 0) { + if (self->nic_type->listen(self, backlog, &_errno) != 0) { mp_raise_OSError(_errno); } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, socket_listen); // method socket.accept() STATIC mp_obj_t socket_accept(mp_obj_t self_in) { |