Skip to content

Commit

Permalink
Merge pull request #4123: Fix iInFlightTCPPings check
Browse files Browse the repository at this point in the history
This PR contains 2 parts:

According to the documentation of Settings::IMaxInFlightTCPPings, a
value of 0 should disable the check. That was not the case though which
is corrected by this commit.

We have received reports about users getting disconnects even though
their network was fine (#3448). By increasing this limit by default, we
should be able to circumvent that.
  • Loading branch information
Krzmbrzl authored May 19, 2020
2 parents 226872f + 7251c30 commit 2504f97
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/mumble/ServerHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ void ServerHandler::sendPingInternal() {
return;
}

if (g.s.iMaxInFlightTCPPings >= 0 && iInFlightTCPPings >= g.s.iMaxInFlightTCPPings) {
if (g.s.iMaxInFlightTCPPings > 0 && iInFlightTCPPings >= g.s.iMaxInFlightTCPPings) {
serverConnectionClosed(QAbstractSocket::UnknownSocketError, tr("Server is not responding to TCP pings"));
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/mumble/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ Settings::Settings() {
bAutoConnect = false;
ptProxyType = NoProxy;
usProxyPort = 0;
iMaxInFlightTCPPings = 2;
iMaxInFlightTCPPings = 4;
bUdpForceTcpAddr = true;
iPingIntervalMsec = 5000;
iConnectionTimeoutDurationMsec = 30000;
Expand Down

0 comments on commit 2504f97

Please sign in to comment.