3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-14 09:48:01 +08:00
Code Issues Projects Releases Wiki Activity

TLS corner cases

Browse Source
This commit is contained in:
Sergio R. Caprile 2024-04-23 11:24:47 -03:00
parent 10029d6a8d
commit f888b30863
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sock.c
View File

@ -480,7 +480,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
size_t max = 1; size_t max = 1;
for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) {
c->is_readable = c->is_writable = 0; c->is_readable = c->is_writable = 0;
if (mg_tls_pending(c) > 0) ms = 1, c->is_readable = 1; if (c->rtls.len > 0 || mg_tls_pending(c) > 0) ms = 1, c->is_readable = 1;
if (can_write(c)) MG_EPOLL_MOD(c, 1); if (can_write(c)) MG_EPOLL_MOD(c, 1);
if (c->is_closing) ms = 1; if (c->is_closing) ms = 1;
max++; max++;
@ -496,7 +496,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
bool wr = evs[i].events & EPOLLOUT; bool wr = evs[i].events & EPOLLOUT;
c->is_readable = can_read(c) && rd ? 1U : 0; c->is_readable = can_read(c) && rd ? 1U : 0;
c->is_writable = can_write(c) && wr ? 1U : 0; c->is_writable = can_write(c) && wr ? 1U : 0;
if (mg_tls_pending(c) > 0) c->is_readable = 1; if (c->rtls.len > 0 || mg_tls_pending(c) > 0) c->is_readable = 1;
} }
} }
(void) skip_iotest; (void) skip_iotest;
@ -510,7 +510,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
c->is_readable = c->is_writable = 0; c->is_readable = c->is_writable = 0;
if (skip_iotest(c)) { if (skip_iotest(c)) {
// Socket not valid, ignore // Socket not valid, ignore
} else if (mg_tls_pending(c) > 0) { } else if (c->rtls.len > 0 || mg_tls_pending(c) > 0) {
ms = 1; // Don't wait if TLS is ready ms = 1; // Don't wait if TLS is ready
} else { } else {
fds[n].fd = FD(c); fds[n].fd = FD(c);
@ -532,7 +532,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) { for (struct mg_connection *c = mgr->conns; c != NULL; c = c->next) {
if (skip_iotest(c)) { if (skip_iotest(c)) {
// Socket not valid, ignore // Socket not valid, ignore
} else if (mg_tls_pending(c) > 0) { } else if (c->rtls.len > 0 || mg_tls_pending(c) > 0) {
c->is_readable = 1; c->is_readable = 1;
} else { } else {
if (fds[n].revents & POLLERR) { if (fds[n].revents & POLLERR) {
@ -541,7 +541,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
c->is_readable = c->is_readable =
(unsigned) (fds[n].revents & (POLLIN | POLLHUP) ? 1 : 0); (unsigned) (fds[n].revents & (POLLIN | POLLHUP) ? 1 : 0);
c->is_writable = (unsigned) (fds[n].revents & POLLOUT ? 1 : 0); c->is_writable = (unsigned) (fds[n].revents & POLLOUT ? 1 : 0);
if (mg_tls_pending(c) > 0) c->is_readable = 1; if (c->rtls.len > 0 || mg_tls_pending(c) > 0) c->is_readable = 1;
} }
n++; n++;
} }
@ -563,7 +563,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
FD_SET(FD(c), &eset); FD_SET(FD(c), &eset);
if (can_read(c)) FD_SET(FD(c), &rset); if (can_read(c)) FD_SET(FD(c), &rset);
if (can_write(c)) FD_SET(FD(c), &wset); if (can_write(c)) FD_SET(FD(c), &wset);
if (mg_tls_pending(c) > 0) tvp = &tv_zero; if (c->rtls.len > 0 || mg_tls_pending(c) > 0) tvp = &tv_zero;
if (FD(c) > maxfd) maxfd = FD(c); if (FD(c) > maxfd) maxfd = FD(c);
if (c->is_closing) ms = 1; if (c->is_closing) ms = 1;
} }
@ -585,7 +585,7 @@ static void mg_iotest(struct mg_mgr *mgr, int ms) {
} else { } else {
c->is_readable = FD(c) != MG_INVALID_SOCKET && FD_ISSET(FD(c), &rset); c->is_readable = FD(c) != MG_INVALID_SOCKET && FD_ISSET(FD(c), &rset);
c->is_writable = FD(c) != MG_INVALID_SOCKET && FD_ISSET(FD(c), &wset); c->is_writable = FD(c) != MG_INVALID_SOCKET && FD_ISSET(FD(c), &wset);
if (mg_tls_pending(c) > 0) c->is_readable = 1; if (c->rtls.len > 0 || mg_tls_pending(c) > 0) c->is_readable = 1;
} }
} }
#endif #endif