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

Stop having ws send subcommand send a binary message in text mode, which would cause error in make ws_test shell script test

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-25 15:39:43 -07:00
parent 05f29639e5
commit 3cd7c0194f
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ws/ws_receive.cpp
View File

@ -59,7 +59,7 @@ namespace ix
, _delayMs(delayMs)
, _receivedFragmentCounter(0)
{
;
_webSocket.disableAutomaticReconnection();
}
void WebSocketReceiver::stop()
@ -113,7 +113,7 @@ namespace ix
pdu["message"] = errMsg;
MsgPack msg(pdu);
_webSocket.send(msg.dump());
_webSocket.sendBinary(msg.dump());
}
void WebSocketReceiver::handleMessage(const std::string& str)
@ -164,8 +164,9 @@ namespace ix
pdu["id"] = data["id"];
pdu["filename"] = data["filename"];
std::cout << "Sending ack to sender" << std::endl;
MsgPack msg(pdu);
_webSocket.send(msg.dump());
_webSocket.sendBinary(msg.dump());
}
void WebSocketReceiver::start()

2
ws/ws_send.cpp
View File

@ -52,7 +52,7 @@ namespace ix
: _url(url)
, _enablePerMessageDeflate(enablePerMessageDeflate)
{
;
_webSocket.disableAutomaticReconnection();
}
void WebSocketSender::stop()