wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-02 13:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper TLS handling for poll(). Make poll() default on linux

Browse Source
This commit is contained in:
Sergey Lyubka committed 2022-05-26 08:55:28 +01:00
1 parent 252e4715d4
commit 10596a8bdc
4 files changed
+38 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/sock.c
+14 -13
View File
@@ -478,7 +478,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
#elif MG_ENABLE_POLL
size_t i = 0, n = 0;
for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) n++;
struct pollfd fds[n == 0 ? 1 : n]; // Avoid zero-length VLA
struct pollfd fds[n == 0 ? 1 : n]; // Avoid zero-length VLA
memset(fds, 0, sizeof(fds));
for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
@@ -488,24 +488,25 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
fds[i].fd = FD(c);
fds[i].events |= POLLIN;
if (c->is_connecting || (c->send.len > 0 && c->is_tls_hs == 0)) {
fds[i].events |= POLLOUT;
fds[i].events |= POLLOUT;
}
if (mg_tls_pending(c) > 0) ms = 0; // Don't wait if TLS is ready
}
}
if (poll(fds, n, ms) < 0) {
MG_ERROR(("poll failed, errno: %d", MG_SOCK_ERRNO));
return;
}
i = 0;
for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
// Socket not valid, ignore
} else {
c->is_readable = (unsigned)(fds[i].revents & POLLIN ? true : false);
c->is_writable = (unsigned)(fds[i].revents & POLLOUT ? true : false);
fds[i].revents = 0;
} else {
i = 0;
for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next, i++) {
if (c->is_closing || c->is_resolving || FD(c) == INVALID_SOCKET) {
// Socket not valid, ignore
} else {
c->is_readable = (unsigned) (fds[i].revents & POLLIN ? true : false);
c->is_writable = (unsigned) (fds[i].revents & POLLOUT ? true : false);
fds[i].revents = 0;
if (mg_tls_pending(c) > 0) c->is_readable = 1;
}
}
}
#else