Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_return_value_in_httpd_socket_apis_v4.4' into…
Browse files Browse the repository at this point in the history
… 'release/v4.4'

esp_http_server: fix return values for `httpd_socket_send()` and `httpd_socket_recv()` APIs (v4.4)

See merge request espressif/esp-idf!22308
  • Loading branch information
mahavirj committed Feb 13, 2023
2 parents cb2fde3 + f7f11cf commit 62340ef
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions components/esp_http_server/src/httpd_txrx.c
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,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);
if (!sess) {
return ESP_ERR_INVALID_ARG;
return HTTPD_SOCK_ERR_INVALID;
}
if (!sess->send_fn) {
return ESP_ERR_INVALID_STATE;
return HTTPD_SOCK_ERR_INVALID;
}
return sess->send_fn(hd, sockfd, buf, buf_len, flags);
}
Expand All @@ -616,10 +616,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);
if (!sess) {
return ESP_ERR_INVALID_ARG;
return HTTPD_SOCK_ERR_INVALID;
}
if (!sess->recv_fn) {
return ESP_ERR_INVALID_STATE;
return HTTPD_SOCK_ERR_INVALID;
}
return sess->recv_fn(hd, sockfd, buf, buf_len, flags);
}

0 comments on commit 62340ef

Please sign in to comment.