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

HTTP Server : Use getsockopt instead of errno

Browse Source
This commit is contained in:
Anurag Kar
2018-10-09 11:42:23 +05:30
parent 47a106879a
commit 7e04e283d5
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/http_server/src/httpd_txrx.c
View File

@@ -472,13 +472,19 @@ int httpd_req_to_sockfd(httpd_req_t *r)
return ra->sd->fd; return ra->sd->fd;
} }
static int httpd_sock_err(const char *ctx) static int httpd_sock_err(const char *ctx, int sockfd)
{ {
int errval; int errval;
int sock_err;
size_t sock_err_len = sizeof(sock_err);
ESP_LOGW(TAG, LOG_FMT("errno in %s : %d"), ctx, errno); if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &sock_err, &sock_err_len) < 0) {
ESP_LOGE(TAG, LOG_FMT("error calling getsockopt : %d"), errno);
return HTTPD_SOCK_ERR_FAIL;
}
ESP_LOGW(TAG, LOG_FMT("error in %s : %d"), ctx, sock_err);
switch(errno) { switch(sock_err) {
case EAGAIN: case EAGAIN:
case EINTR: case EINTR:
errval = HTTPD_SOCK_ERR_TIMEOUT; errval = HTTPD_SOCK_ERR_TIMEOUT;
@@ -503,7 +509,7 @@ int httpd_default_send(int sockfd, const char *buf, size_t buf_len, int flags)
int ret = send(sockfd, buf, buf_len, flags); int ret = send(sockfd, buf, buf_len, flags);
if (ret < 0) { if (ret < 0) {
return httpd_sock_err("send"); return httpd_sock_err("send", sockfd);
} }
return ret; return ret;
} }
@@ -516,7 +522,7 @@ int httpd_default_recv(int sockfd, char *buf, size_t buf_len, int flags)
int ret = recv(sockfd, buf, buf_len, flags); int ret = recv(sockfd, buf, buf_len, flags);
if (ret < 0) { if (ret < 0) {
return httpd_sock_err("recv"); return httpd_sock_err("recv", sockfd);
} }
return ret; return ret;
} }