Skip to content

Fix: timers stop firing if the reactor has no sockets, only happens on bots that have little activity #1401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
braindigitalis merged 2 commits into from
Mar 18, 2025
Merged

Fix: timers stop firing if the reactor has no sockets, only happens on bots that have little activity #1401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d12dc98
Fix: timers dying when there are no sockets to connect
braindigitalis Mar 17, 2025
28fe377
roll back SSL change. Voice websockets seem to not support it yet
braindigitalis Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/dpp/socketengines/epoll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ struct DPP_EXPORT socket_engine_epoll : public socket_engine_base {

void process_events() final {
const int sleep_length = 1000;
if (sockets == 0) {
/* epoll_wait() on empty set waits forever (or until another thread inserts a socket into the set.
* We can't trust that this is going to happen, and it may deadlock the cluster, so in the event the
* set is empty, we wait a millisecond (so it isn't a busy-wait) and return.
*/
std::this_thread::sleep_for(std::chrono::milliseconds(1));
return;
}
int i = epoll_wait(epoll_handle, events.data(), MAX_EVENTS, sleep_length);

for (int j = 0; j < i; j++) {
Expand Down
1 change: 1 addition & 0 deletions src/dpp/socketengines/kqueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct DPP_EXPORT socket_engine_kqueue : public socket_engine_base {

int i = kevent(kqueue_handle, nullptr, 0, ke_list.data(), static_cast<int>(ke_list.size()), &ts);
if (i < 0) {
prune();
return;
}

Expand Down
4 changes: 2 additions & 2 deletions src/dpp/ssl_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ wrapped_ssl_ctx* generate_ssl_context(uint16_t port, const std::string &private_
}

/* This sets the allowed SSL/TLS versions for the connection.
* Do not allow SSL 3.0, TLS 1.0 or 1.1
* Do not allow SSL 3.0, TLS < 1.3
* https://www.packetlabs.net/posts/tls-1-1-no-longer-secure/
*/
if (!SSL_CTX_set_min_proto_version(context->context, TLS1_2_VERSION)) {
if (!SSL_CTX_set_min_proto_version(context->context, TLS1_3_VERSION)) {
throw dpp::connection_exception(err_ssl_version, "Failed to set minimum SSL version!");
}

Expand Down
Loading