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

make closeWireSize a default parameter of WebSocketTransport::close

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-04-16 09:55:12 -07:00
parent 935e6791a3
commit bcf2fc1812
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ixwebsocket/IXWebSocketTransport.cpp
View File

@ -775,11 +775,6 @@ namespace ix
_lastSendTimePoint = std::chrono::steady_clock::now(); _lastSendTimePoint = std::chrono::steady_clock::now();
} }
void WebSocketTransport::close(uint16_t code, const std::string& reason)
{
close(code, reason, 0);
}
void WebSocketTransport::close(uint16_t code, const std::string& reason, size_t closeWireSize) void WebSocketTransport::close(uint16_t code, const std::string& reason, size_t closeWireSize)
{ {
_requestInitCancellation = true; _requestInitCancellation = true;

8
ixwebsocket/IXWebSocketTransport.h
View File

@ -81,7 +81,11 @@ namespace ix
WebSocketSendInfo sendText(const std::string& message, WebSocketSendInfo sendText(const std::string& message,
const OnProgressCallback& onProgressCallback); const OnProgressCallback& onProgressCallback);
WebSocketSendInfo sendPing(const std::string& message); WebSocketSendInfo sendPing(const std::string& message);
void close(uint16_t code = 1000, const std::string& reason = "Normal closure");
void close(uint16_t code = 1000,
const std::string& reason = "Normal closure",
size_t closeWireSize = 0);
ReadyStateValues getReadyState() const; ReadyStateValues getReadyState() const;
void setReadyState(ReadyStateValues readyStateValue); void setReadyState(ReadyStateValues readyStateValue);
void setOnCloseCallback(const OnCloseCallback& onCloseCallback); void setOnCloseCallback(const OnCloseCallback& onCloseCallback);
@ -164,8 +168,6 @@ namespace ix
// No data was send through the socket for longer than the heartbeat period // No data was send through the socket for longer than the heartbeat period
bool heartBeatPeriodExceeded(); bool heartBeatPeriodExceeded();
void close(uint16_t code, const std::string& reason, size_t closeWireSize);
void sendOnSocket(); void sendOnSocket();
WebSocketSendInfo sendData(wsheader_type::opcode_type type, WebSocketSendInfo sendData(wsheader_type::opcode_type type,
const std::string& message, const std::string& message,