Skip to content

Fix skip invalid socket #477

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
WiserTixx merged 2 commits into from
Mar 28, 2026
Merged

Fix skip invalid socket #477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b2621
Revert "Skip invalid socket when accept() fails"
SaltySnail Mar 28, 2026
75e9c52
Rewrite accept code to not use continue
SaltySnail Mar 28, 2026
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
11 changes: 6 additions & 5 deletions src/TNetwork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,14 @@ void TNetwork::TCPServerMain() {
}
ip::tcp::endpoint ClientEp;
ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
if (ec) {
if (!ec) {
TConnection Conn { std::move(ClientSocket), ClientEp };
std::thread ID(&TNetwork::Identify, this, std::move(Conn));
ID.detach(); // TODO: Add to a queue and attempt to join periodically
}
else {
beammp_errorf("Failed to accept() new client: {}", ec.message());
continue;
}
TConnection Conn { std::move(ClientSocket), ClientEp };
std::thread ID(&TNetwork::Identify, this, std::move(Conn));
ID.detach();
} catch (const std::exception& e) {
beammp_errorf("Exception in accept routine: {}", e.what());
}
Expand Down
Loading