espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/websocket_server_support_close_handle_v4.3' into 'release/v4.3'

Browse Source 
esp_http_server: Websocket CLOSE frame can support callback function (backport v4.3)

See merge request espressif/esp-idf!17340
This commit is contained in:
Mahavir Jain
2022-03-04 13:37:52 +08:00
parent 0aa2b4eaec 29f5f119b2
commit 028f1d9345
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_http_server/src/httpd_parse.c
View File

@ -761,13 +761,10 @@ esp_err_t httpd_req_new(struct httpd_data *hd, struct sock_db *sd)
ret = httpd_ws_get_frame_type(r);
ESP_LOGD(TAG, LOG_FMT("New WS request from existing socket, ws_type=%d"), ra->ws_type);
/* Stop and return here immediately if it's a CLOSE frame */
if (ra->ws_type == HTTPD_WS_TYPE_CLOSE) {
/* Only mark ws_close to true if it's a CLOSE frame */
sd->ws_close = true;
return ret;
}
if (ra->ws_type == HTTPD_WS_TYPE_PONG) {
} else if (ra->ws_type == HTTPD_WS_TYPE_PONG) {
/* Pass the PONG frames to the handler as well, as user app might send PINGs */
ESP_LOGD(TAG, LOG_FMT("Received PONG frame"));
}