kerms
/
wireless-proxy-esp32
0
0
Fork 0
Code

fix(ws) memory leak due to json.in and ws not closed correctly

This commit is contained in:
kerms 2024-06-22 14:32:56 +08:00
parent 209f62866b
commit b5a4b38c8d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
project_components/web_server/uri_modules/uri_ws.c
View File

@ -146,20 +146,19 @@ static esp_err_t ws_req_handler(httpd_req_t *req)
case HTTPD_WS_TYPE_CLOSE: case HTTPD_WS_TYPE_CLOSE:
if ((err = httpd_ws_recv_frame(req, ws_pkt, 126)) != ESP_OK) { if ((err = httpd_ws_recv_frame(req, ws_pkt, 126)) != ESP_OK) {
ESP_LOGE(TAG, "Cannot receive the full CLOSE frame"); ESP_LOGE(TAG, "Cannot receive the full CLOSE frame");
goto end;
} }
return ws_on_close(req, ws_pkt, ws_msg); return ws_on_close(req, ws_pkt, ws_msg);
case HTTPD_WS_TYPE_PING: case HTTPD_WS_TYPE_PING:
/* Now turn the frame to PONG */ /* Now turn the frame to PONG */
ESP_LOGI(TAG, "PING received");
if ((err = httpd_ws_recv_frame(req, ws_pkt, 126)) != ESP_OK) { if ((err = httpd_ws_recv_frame(req, ws_pkt, 126)) != ESP_OK) {
ESP_LOGE(TAG, "Cannot receive the full PONG frame"); ESP_LOGE(TAG, "Cannot receive the full PONG frame");
goto end; return ws_on_close(req, ws_pkt, ws_msg);
} }
ws_pkt->type = HTTPD_WS_TYPE_PONG; ws_pkt->type = HTTPD_WS_TYPE_PONG;
err = ws_send_frame_safe(req->handle, httpd_req_to_sockfd(req), ws_pkt); err = ws_send_frame_safe(req->handle, httpd_req_to_sockfd(req), ws_pkt);
if (err) { if (err) {
ESP_LOGE(TAG, "Cannot send PONG frame %s", esp_err_to_name(err)); ESP_LOGE(TAG, "Cannot send PONG frame %s", esp_err_to_name(err));
return ws_on_close(req, ws_pkt, ws_msg);
} }
goto end; goto end;
case HTTPD_WS_TYPE_PONG: case HTTPD_WS_TYPE_PONG:
@ -311,7 +310,16 @@ static void ws_async_resp(void *arg)
void async_send_out_cb(void *arg, int module_status) void async_send_out_cb(void *arg, int module_status)
{ {
ws_msg_t *req = arg; ws_msg_t *req = arg;
cJSON_Delete(req->json.in);
ESP_LOGI(TAG, "send out %d", module_status);
if (module_status != API_JSON_OK) { if (module_status != API_JSON_OK) {
req->ws_pkt.payload = req->payload;
ws_set_err_msg(&req->ws_pkt, module_status);
int err = ws_send_frame_safe(req->hd, req->fd, &req->ws_pkt);
if (err) {
ESP_LOGE(TAG, "send out %s", esp_err_to_name(err));
}
goto end; goto end;
} }
@ -412,7 +420,7 @@ void heartbeat_task(void *arg)
{ {
(void)arg; (void)arg;
while (1) { while (1) {
vTaskDelay(pdMS_TO_TICKS(2000)); vTaskDelay(pdMS_TO_TICKS(1500));
ws_broadcast_heartbeat(); ws_broadcast_heartbeat();
} }
}; };