talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use us_socket_is_closed, fix non-SSL/Windows build

Browse Source
This commit is contained in:
Alex Hultman
2018-12-19 09:22:05 +01:00
parent ff4f3341ad
commit 7c3585afee
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WebSocketContext.h
+2 -5
View File
@@ -23,9 +23,6 @@
#include "WebSocketData.h"
#include "AsyncSocket.h"
/* This is a hack for now on, update uSockets */
extern "C" int us_internal_socket_is_closed(struct us_socket *s);
namespace uWS {
template <bool SSL, bool isServer>
@@ -122,7 +119,7 @@ private:
/* Emit message event & break if we are closed or shut down when returning */
webSocketContextData->messageHandler((WebSocket<SSL, isServer> *) s, std::string_view(data, length), (uWS::OpCode) opCode);
if (us_internal_socket_is_closed((us_socket *) s) || webSocketData->isShuttingDown) {
if (us_socket_is_closed((us_socket *) s) || webSocketData->isShuttingDown) {
return true;
}
} else {
@@ -183,7 +180,7 @@ private:
/* Emit message and check for shutdown or close */
webSocketContextData->messageHandler((WebSocket<SSL, isServer> *) s, std::string_view(data, length), (uWS::OpCode) opCode);
if (us_internal_socket_is_closed((us_socket *) s) || webSocketData->isShuttingDown) {
if (us_socket_is_closed((us_socket *) s) || webSocketData->isShuttingDown) {
return true;
}