From f728202ee93dc447b27d5537c7c2249bf685d40c Mon Sep 17 00:00:00 2001 From: yuanjm Date: Fri, 27 Aug 2021 17:20:14 +0800 Subject: [PATCH] esp_http_server: Fix ws server handle length over 1440(MTU) messages incorrectly. Closes https://github.com/espressif/esp-idf/issues/7457 --- components/esp_http_server/src/httpd_ws.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/components/esp_http_server/src/httpd_ws.c b/components/esp_http_server/src/httpd_ws.c index e9e3377103..7afbd4afb0 100644 --- a/components/esp_http_server/src/httpd_ws.c +++ b/components/esp_http_server/src/httpd_ws.c @@ -332,9 +332,19 @@ esp_err_t httpd_ws_recv_frame(httpd_req_t *req, httpd_ws_frame_t *frame, size_t return ESP_FAIL; } - if (httpd_recv_with_opt(req, (char *)frame->payload, frame->len, false) <= 0) { - ESP_LOGW(TAG, LOG_FMT("Failed to receive payload")); - return ESP_FAIL; + size_t left_len = frame->len; + size_t offset = 0; + + while (left_len > 0) { + int read_len = httpd_recv_with_opt(req, (char *)frame->payload + offset, left_len, false); + if (read_len <= 0) { + ESP_LOGW(TAG, LOG_FMT("Failed to receive payload")); + return ESP_FAIL; + } + offset += read_len; + left_len -= read_len; + + ESP_LOGD(TAG, "Frame length: %d, Bytes Read: %d", frame->len, offset); } /* Unmask payload */