summaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2020-11-24 18:14:22 -0800
committerScott Shawcroft <scott@tannewt.org>2020-11-24 18:14:22 -0800
commit9a692c3222013efdbcedea95cadf29c0379ca17c (patch)
tree251917b9e02effaea5c623434231d6aea12cd06c /ports
parente778fc1f876116fd8f07b95f9eb8439745988fba (diff)
Exit faster on recv when TLS connection closed
When a TLS connection is closed by the server it usually sends a notice. We see this incoming byte with lwip_ioctl and try to read it. The read returns 0 but we keep trying anyway. Now, we quit trying when we get zero back. If the connection was still alive it'd either read a byte or delay until a byte could be read.
Diffstat (limited to 'ports')
-rw-r--r--ports/esp32s2/common-hal/socketpool/Socket.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ports/esp32s2/common-hal/socketpool/Socket.c b/ports/esp32s2/common-hal/socketpool/Socket.c
index 750415dc7..999d39990 100644
--- a/ports/esp32s2/common-hal/socketpool/Socket.c
+++ b/ports/esp32s2/common-hal/socketpool/Socket.c
@@ -103,6 +103,11 @@ mp_uint_t common_hal_socketpool_socket_recv_into(socketpool_socket_obj_t* self,
}
if (available > 0) {
status = esp_tls_conn_read(self->tcp, (void*) buf + received, available);
+ if (status == 0) {
+ // Reading zero when something is available indicates a closed
+ // connection. (The available bytes could have been TLS internal.)
+ break;
+ }
if (status > 0) {
received += status;
}