LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-08-13 13:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get ping/pong handling sorted with more isClient conditionality.

Browse Source 
Change-Id: I859ed5b5bcc302304e23ad3554247af920de2421
This commit is contained in:
Michael Meeks
2018-05-02 15:40:16 +01:00
committed by Jan Holesovsky
parent 80a13a1e7b
commit 4cf2ee4fab
1 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
net/WebSocketHandler.hpp
View File

@ -197,24 +197,51 @@ public:
", fin? " << fin << ", mask? " << hasMask << ", payload length: " << _wsPayload.size() <<
", residual socket data: " << socket->_inBuffer.size() << " bytes.");
bool doClose = false;
switch (code)
{
case WSOpCode::Pong:
{
_pingTimeUs = std::chrono::duration_cast<std::chrono::microseconds>
(std::chrono::steady_clock::now() - _lastPingSentTime).count();
LOG_TRC("#" << socket->getFD() << ": Pong received: " << _pingTimeUs << " microseconds");
break;
if (_isClient)
{
LOG_ERR("#" << socket->getFD() << ": Servers should not send pongs, only clients");
doClose = true;
break;
}
else
{
_pingTimeUs = std::chrono::duration_cast<std::chrono::microseconds>
(std::chrono::steady_clock::now() - _lastPingSentTime).count();
LOG_TRC("#" << socket->getFD() << ": Pong received: " << _pingTimeUs << " microseconds");
break;
}
}
case WSOpCode::Ping:
LOG_ERR("#" << socket->getFD() << ": Clients should not send pings, only servers");
// drop through
#if defined __clang__
[[clang::fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
[[fallthrough]];
#endif
if (_isClient)
{
auto now = std::chrono::steady_clock::now();
_pingTimeUs = std::chrono::duration_cast<std::chrono::microseconds>
(now - _lastPingSentTime).count();
sendPong(now, &_wsPayload[0], payloadLen, socket);
break;
}
else
{
LOG_ERR("#" << socket->getFD() << ": Clients should not send pings, only servers");
doClose = true;
}
break;
case WSOpCode::Close:
doClose = true;
break;
default:
handleMessage(fin, code, _wsPayload);
break;
}
if (doClose)
{
if (!_shuttingDown)
{
// Peer-initiated shutdown must be echoed.
@ -239,10 +266,6 @@ public:
// TCP Close.
socket->closeConnection();
break;
default:
handleMessage(fin, code, _wsPayload);
break;
}
_wsPayload.clear();
@ -270,15 +293,20 @@ public:
int getPollEvents(std::chrono::steady_clock::time_point now,
int & timeoutMaxMs) override
{
const int timeSincePingMs =
std::chrono::duration_cast<std::chrono::milliseconds>(now - _lastPingSentTime).count();
timeoutMaxMs = std::min(timeoutMaxMs, PingFrequencyMs - timeSincePingMs);
if (!_isClient)
{
const int timeSincePingMs =
std::chrono::duration_cast<std::chrono::milliseconds>(now - _lastPingSentTime).count();
timeoutMaxMs = std::min(timeoutMaxMs, PingFrequencyMs - timeSincePingMs);
}
return POLLIN;
}
/// Send a ping message
void sendPing(std::chrono::steady_clock::time_point now,
const std::shared_ptr<StreamSocket>& socket)
void sendPingOrPong(std::chrono::steady_clock::time_point now,
const char* data, const size_t len,
const WSOpCode code,
const std::shared_ptr<StreamSocket>& socket)
{
assert(socket && "Expected a valid socket instance.");
@ -290,15 +318,34 @@ public:
return;
}
LOG_TRC("#" << socket->getFD() << ": Sending ping.");
LOG_TRC("#" << socket->getFD() << ": Sending " <<
(const char *)(code == WSOpCode::Ping ? " ping." : "pong."));
// FIXME: allow an empty payload.
sendMessage("", 1, WSOpCode::Ping, false);
sendMessage(data, len, code, false);
_lastPingSentTime = now;
}
void sendPing(std::chrono::steady_clock::time_point now,
const std::shared_ptr<StreamSocket>& socket)
{
assert(!_isClient);
sendPingOrPong(now, "", 1, WSOpCode::Ping, socket);
}
void sendPong(std::chrono::steady_clock::time_point now,
const char* data, const size_t len,
const std::shared_ptr<StreamSocket>& socket)
{
assert(_isClient);
sendPingOrPong(now, data, len, WSOpCode::Pong, socket);
}
/// Do we need to handle a timeout ?
void checkTimeout(std::chrono::steady_clock::time_point now) override
{
if (_isClient)
return;
const int timeSincePingMs =
std::chrono::duration_cast<std::chrono::milliseconds>(now - _lastPingSentTime).count();
if (timeSincePingMs >= PingFrequencyMs)