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

- WebSocket::send() sends message in TEXT mode by default

Browse Source 
- WebSocketMessage sets a new binary field, which tells whether the received incoming message is binary or text
This commit is contained in:
Benjamin Sergeant
2019-06-09 11:55:34 -07:00
parent 0d147cbd94
commit 3e15840b14
11 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -542,12 +542,17 @@ namespace ix
) {
unmaskReceiveBuffer(ws);
MessageKind messageKind =
(ws.opcode == wsheader_type::TEXT_FRAME)
? MessageKind::MSG_TEXT
: MessageKind::MSG_BINARY;
//
// Usual case. Small unfragmented messages
//
if (ws.fin && _chunks.empty())
{
emitMessage(MessageKind::MSG,
emitMessage(messageKind,
std::string(_rxbuf.begin()+ws.header_size,
_rxbuf.begin()+ws.header_size+(size_t) ws.N),
ws,
@ -567,7 +572,7 @@ namespace ix
_rxbuf.begin()+ws.header_size+(size_t)ws.N));
if (ws.fin)
{
emitMessage(MessageKind::MSG, getMergedChunks(), ws, onMessageCallback);
emitMessage(messageKind, getMergedChunks(), ws, onMessageCallback);
_chunks.clear();
}
else