Skip to content
Permalink
Browse files

Merge PR #3303: ServerHandler: do not send pings unless the TLS hands…

…hake has completed.
  • Loading branch information...
mkrautz committed Jan 13, 2018
2 parents 1844f21 + d188861 commit 2c24ee0faaef06475853a873bf50c6490581a0b3
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/mumble/ServerHandler.cpp
@@ -461,6 +461,11 @@ void ServerHandler::sendPingInternal() {
return;
}

// Ensure the TLS handshake has completed before sending pings.
if (!qtsSock->isEncrypted()) {
return;
}

if (g.s.iMaxInFlightTCPPings >= 0 && iInFlightTCPPings >= g.s.iMaxInFlightTCPPings) {
serverConnectionClosed(QAbstractSocket::UnknownSocketError, tr("Server is not responding to TCP pings"));
return;

0 comments on commit 2c24ee0

Please sign in to comment.
You can’t perform that action at this time.