kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor refactoring

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-03-18 11:45:28 -07:00
parent 696d802703
commit 6085839ef7
3 changed files with 14 additions and 7 deletions

8
ixwebsocket/IXWebSocket.cpp

@ -203,7 +203,11 @@ namespace ix
WebSocketOpenInfo(status.uri, status.headers, status.protocol), WebSocketOpenInfo(status.uri, status.headers, status.protocol),
WebSocketCloseInfo())); WebSocketCloseInfo()));
if (_pingIntervalSecs > 0)
{
// Send a heart beat right away
_ws.sendHeartBeat(); _ws.sendHeartBeat();
}
return status; return status;
} }
@ -232,7 +236,11 @@ namespace ix
WebSocketOpenInfo(status.uri, status.headers), WebSocketOpenInfo(status.uri, status.headers),
WebSocketCloseInfo())); WebSocketCloseInfo()));
if (_pingIntervalSecs > 0)
{
// Send a heart beat right away
_ws.sendHeartBeat(); _ws.sendHeartBeat();
}
return status; return status;
} }

6
ixwebsocket/IXWebSocketTransport.cpp

@ -215,14 +215,12 @@ namespace ix
return now - _lastSendPingTimePoint > std::chrono::seconds(_pingIntervalSecs); return now - _lastSendPingTimePoint > std::chrono::seconds(_pingIntervalSecs);
} }
void WebSocketTransport::sendHeartBeat() WebSocketSendInfo WebSocketTransport::sendHeartBeat()
{ {
if (_pingIntervalSecs <= 0) return;
_pongReceived = false; _pongReceived = false;
std::stringstream ss; std::stringstream ss;
ss << kPingMessage << "::" << _pingIntervalSecs << "s"; ss << kPingMessage << "::" << _pingIntervalSecs << "s";
sendPing(ss.str()); return sendPing(ss.str());
} }
bool WebSocketTransport::closingDelayExceeded() bool WebSocketTransport::closingDelayExceeded()

3
ixwebsocket/IXWebSocketTransport.h

@ -105,7 +105,8 @@ namespace ix
void dispatch(PollResult pollResult, const OnMessageCallback& onMessageCallback); void dispatch(PollResult pollResult, const OnMessageCallback& onMessageCallback);
size_t bufferedAmount() const; size_t bufferedAmount() const;
void sendHeartBeat(); // internal
WebSocketSendInfo sendHeartBeat();
private: private:
std::string _url; std::string _url;