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

minor improvements (#66)

Browse Source 
* minor improvements

* fix build

* improve tests code
This commit is contained in:
Dimon4eg
2019-05-11 22:20:58 +03:00
committed by Benjamin Sergeant
parent 4934f5846b
commit 2254421ead
8 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ixwebsocket/IXWebSocket.cpp
View File

@ -148,6 +148,8 @@ namespace ix
if (_thread.joinable())
{
// wait until working thread will exit
// it will exit after close operation is finished
_stop = true;
_thread.join();
_stop = false;
@ -361,10 +363,10 @@ namespace ix
}
}
WebSocketSendInfo WebSocket::send(const std::string& text,
WebSocketSendInfo WebSocket::send(const std::string& data,
const OnProgressCallback& onProgressCallback)
{
return sendMessage(text, SendMessageKind::Binary, onProgressCallback);
return sendMessage(data, SendMessageKind::Binary, onProgressCallback);
}
WebSocketSendInfo WebSocket::sendText(const std::string& text,

3
ixwebsocket/IXWebSocket.h
View File

@ -106,7 +106,8 @@ namespace ix
WebSocketInitResult connect(int timeoutSecs);
void run();
WebSocketSendInfo send(const std::string& text,
// send binary data
WebSocketSendInfo send(const std::string& data,
const OnProgressCallback& onProgressCallback = nullptr);
WebSocketSendInfo sendText(const std::string& text,
const OnProgressCallback& onProgressCallback = nullptr);

3
ixwebsocket/IXWebSocketSendInfo.h
View File

@ -6,9 +6,6 @@
#pragma once
#include <string>
#include <iostream>
namespace ix
{
struct WebSocketSendInfo

2
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -719,7 +719,7 @@ namespace ix
bool compress,
const OnProgressCallback& onProgressCallback)
{
if (_readyState == CLOSING || _readyState == CLOSED)
if (_readyState != OPEN)
{
return WebSocketSendInfo();
}

1
ixwebsocket/windows/IXSetThreadName_windows.cpp
View File

@ -4,7 +4,6 @@
* Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
*/
#include "../IXSetThreadName.h"
#include <iostream>
#include <Windows.h>
namespace ix