Skip to content
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

RemoteServer: reset fail counter after success #4041

Merged
merged 1 commit into from
Nov 20, 2023
+6 −3
Merged

RemoteServer: reset fail counter after success #4041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions library/RemoteServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace {
struct BlockedException : std::exception {
const char* what() const noexcept override
{
return "Core has blocked all connection. This should have been catched.";
return "Core has blocked all connection. This should have been caught.";
}
};
}
Expand Down Expand Up @@ -478,23 +478,26 @@ void ServerMainImpl::threadFn(std::promise<bool> promise, int port)
CActiveSocket *client = nullptr;

try {
for (int acceptFail = 0 ; server.socket.IsSocketValid() && acceptFail < 5 ; acceptFail++)
for (int acceptFail = 0; server.socket.IsSocketValid() && acceptFail < 5; acceptFail++)
{
if ((client = server.socket.Accept()) != NULL)
{
BlockGuard lock;
ServerConnection::Accepted(client);
client = nullptr;
acceptFail = 0;
}
else
{
WARN(socket).print("Connection failure: %s (%d of %d)\n", server.socket.DescribeError(), acceptFail + 1, 5);
}
}
} catch(BlockedException &) {
}
catch (BlockedException&) {
if (client)
client->Close();
delete client;
WARN(socket).print("Connection failure: unexpectedly blocked");
}

if (server.socket.IsSocketValid())
Expand Down