mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-02 03:03:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix #1354 - report correct errno in mg_open_listener()

Browse Source
This commit is contained in:
Sergey Lyubka 2021-09-22 18:52:42 +01:00
parent 1928ba9c1f
commit f73ebbf689
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mongoose.c
View File

@ -2973,6 +2973,7 @@ static void mg_set_non_blocking_mode(SOCKET fd) {
SOCKET mg_open_listener(const char *url, struct mg_addr *addr) { SOCKET mg_open_listener(const char *url, struct mg_addr *addr) {
SOCKET fd = INVALID_SOCKET; SOCKET fd = INVALID_SOCKET;
int s_err = 0; // Memoized socket error, in case closesocket() overrides it
memset(addr, 0, sizeof(*addr)); memset(addr, 0, sizeof(*addr));
addr->port = mg_htons(mg_url_port(url)); addr->port = mg_htons(mg_url_port(url));
if (!mg_aton(mg_url_host(url), addr)) { if (!mg_aton(mg_url_host(url), addr)) {
@ -3020,12 +3021,14 @@ SOCKET mg_open_listener(const char *url, struct mg_addr *addr) {
} }
mg_set_non_blocking_mode(fd); mg_set_non_blocking_mode(fd);
} else if (fd != INVALID_SOCKET) { } else if (fd != INVALID_SOCKET) {
s_err = MG_SOCK_ERRNO;
closesocket(fd); closesocket(fd);
fd = INVALID_SOCKET; fd = INVALID_SOCKET;
} }
} }
if (fd == INVALID_SOCKET) { if (fd == INVALID_SOCKET) {
LOG(LL_ERROR, ("Failed to listen on %s, errno %d", url, MG_SOCK_ERRNO)); if (s_err = 0) s_err = MG_SOCK_ERRNO;
LOG(LL_ERROR, ("Failed to listen on %s, errno %d", url, s_err));
} }
return fd; return fd;

5
src/sock.c
View File

@ -127,6 +127,7 @@ static void mg_set_non_blocking_mode(SOCKET fd) {
SOCKET mg_open_listener(const char *url, struct mg_addr *addr) { SOCKET mg_open_listener(const char *url, struct mg_addr *addr) {
SOCKET fd = INVALID_SOCKET; SOCKET fd = INVALID_SOCKET;
int s_err = 0; // Memoized socket error, in case closesocket() overrides it
memset(addr, 0, sizeof(*addr)); memset(addr, 0, sizeof(*addr));
addr->port = mg_htons(mg_url_port(url)); addr->port = mg_htons(mg_url_port(url));
if (!mg_aton(mg_url_host(url), addr)) { if (!mg_aton(mg_url_host(url), addr)) {
@ -174,12 +175,14 @@ SOCKET mg_open_listener(const char *url, struct mg_addr *addr) {
} }
mg_set_non_blocking_mode(fd); mg_set_non_blocking_mode(fd);
} else if (fd != INVALID_SOCKET) { } else if (fd != INVALID_SOCKET) {
s_err = MG_SOCK_ERRNO;
closesocket(fd); closesocket(fd);
fd = INVALID_SOCKET; fd = INVALID_SOCKET;
} }
} }
if (fd == INVALID_SOCKET) { if (fd == INVALID_SOCKET) {
LOG(LL_ERROR, ("Failed to listen on %s, errno %d", url, MG_SOCK_ERRNO)); if (s_err = 0) s_err = MG_SOCK_ERRNO;
LOG(LL_ERROR, ("Failed to listen on %s, errno %d", url, s_err));
} }
return fd; return fd;