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

more cleanup to propagate server connection error and let onOpen callback execute

Browse Source
This commit is contained in:
Benjamin Sergeant
2018-12-31 12:43:47 -08:00
parent 63138507d6
commit 3443e82812
6 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ixwebsocket/IXWebSocket.cpp
View File

@ -105,10 +105,10 @@ namespace ix
{
{
std::lock_guard<std::mutex> lock(_configMutex);
_ws.configure(_url, _perMessageDeflateOptions);
_ws.configure(_perMessageDeflateOptions);
}
WebSocketInitResult status = _ws.init();
WebSocketInitResult status = _ws.connectToUrl(_url);
if (!status.success)
{
return status;
@ -120,9 +120,23 @@ namespace ix
return status;
}
void WebSocket::setSocketFileDescriptor(int fd)
WebSocketInitResult WebSocket::connectToSocket(int fd)
{
_ws.initFromSocket(fd);
{
std::lock_guard<std::mutex> lock(_configMutex);
_ws.configure(_perMessageDeflateOptions);
}
WebSocketInitResult status = _ws.connectToSocket(fd);
if (!status.success)
{
return status;
}
_onMessageCallback(WebSocket_MessageType_Open, "", 0,
WebSocketErrorInfo(), WebSocketCloseInfo(),
status.headers);
return status;
}
bool WebSocket::isConnected() const