espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_return_value_in_httpd_socket_apis_v5.0' into 'release/v5.0'

Browse Source 
esp_http_server: fix return values for `httpd_socket_send()` and `httpd_socket_recv()` APIs (v5.0)

See merge request espressif/esp-idf!22307
This commit is contained in:
Mahavir Jain
2023-02-19 12:10:36 +08:00
parent c71f9a3e1e 935661ba4a
commit a823a4907f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_http_server/src/httpd_txrx.c
View File

@@ -622,10 +622,10 @@ int httpd_socket_send(httpd_handle_t hd, int sockfd, const char *buf, size_t buf
{ {
struct sock_db *sess = httpd_sess_get(hd, sockfd); struct sock_db *sess = httpd_sess_get(hd, sockfd);
if (!sess) { if (!sess) {
return ESP_ERR_INVALID_ARG; return HTTPD_SOCK_ERR_INVALID;
} }
if (!sess->send_fn) { if (!sess->send_fn) {
return ESP_ERR_INVALID_STATE; return HTTPD_SOCK_ERR_INVALID;
} }
return sess->send_fn(hd, sockfd, buf, buf_len, flags); return sess->send_fn(hd, sockfd, buf, buf_len, flags);
} }
@@ -634,10 +634,10 @@ int httpd_socket_recv(httpd_handle_t hd, int sockfd, char *buf, size_t buf_len,
{ {
struct sock_db *sess = httpd_sess_get(hd, sockfd); struct sock_db *sess = httpd_sess_get(hd, sockfd);
if (!sess) { if (!sess) {
return ESP_ERR_INVALID_ARG; return HTTPD_SOCK_ERR_INVALID;
} }
if (!sess->recv_fn) { if (!sess->recv_fn) {
return ESP_ERR_INVALID_STATE; return HTTPD_SOCK_ERR_INVALID;
} }
return sess->recv_fn(hd, sockfd, buf, buf_len, flags); return sess->recv_fn(hd, sockfd, buf, buf_len, flags);
} }