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

(websocket server) Handle programmer error when the server callback is not registered properly (fix #227)

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-08-06 04:40:32 -07:00
parent b15c4189f5
commit 12f36b61ff
5 changed files with 123 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ixwebsocket/IXWebSocket.cpp
View File

@ -405,6 +405,11 @@ namespace ix
_onMessageCallback = callback;
}
bool WebSocket::isOnMessageCallbackRegistered() const
{
return _onMessageCallback != nullptr;
}
void WebSocket::setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback)
{
_onTrafficTrackerCallback = callback;

1
ixwebsocket/IXWebSocket.h
View File

@ -84,6 +84,7 @@ namespace ix
const std::string& reason = WebSocketCloseConstants::kNormalClosureMessage);
void setOnMessageCallback(const OnMessageCallback& callback);
bool isOnMessageCallbackRegistered() const;
static void setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback);
static void resetTrafficTrackerCallback();

9
ixwebsocket/IXWebSocketServer.cpp
View File

@ -86,6 +86,15 @@ namespace ix
if (_onConnectionCallback)
{
_onConnectionCallback(webSocket, connectionState, std::move(connectionInfo));
if (!webSocket->isOnMessageCallbackRegistered())
{
logError("WebSocketServer Application developer error: Server callback improperly "
"registerered.");
logError("Missing call to setOnMessageCallback inside setOnConnectionCallback.");
connectionState->setTerminated();
return;
}
}
else if (_onClientMessageCallback)
{