From bcf5957d05ce4b59046efa5aa50a6e3c3fed8e67 Mon Sep 17 00:00:00 2001 From: Nathan-ma Date: Fri, 25 Dec 2020 21:14:23 -0300 Subject: [PATCH 1/2] Update WebSocketsServer.h WSclient_t * newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient); Is now public --- src/WebSocketsServer.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/WebSocketsServer.h b/src/WebSocketsServer.h index 978cd55..51fd8e3 100644 --- a/src/WebSocketsServer.h +++ b/src/WebSocketsServer.h @@ -35,7 +35,9 @@ class WebSocketsServerCore : protected WebSockets { public: WebSocketsServerCore(const String & origin = "", const String & protocol = "arduino"); virtual ~WebSocketsServerCore(void); - + + WSclient_t * newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient); + void begin(void); void close(void); @@ -116,7 +118,6 @@ class WebSocketsServerCore : protected WebSockets { uint32_t _pongTimeout; uint8_t _disconnectTimeoutCount; - WSclient_t * newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient); void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool fin); From eceebe261abe936e99e8695a702f9b3d4e325d4c Mon Sep 17 00:00:00 2001 From: Nathan-ma Date: Sun, 17 Jan 2021 17:19:32 -0300 Subject: [PATCH 2/2] Fixing WebSocket Close --- src/WebSocketsServer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WebSocketsServer.cpp b/src/WebSocketsServer.cpp index c8ac2ef..a3d242e 100644 --- a/src/WebSocketsServer.cpp +++ b/src/WebSocketsServer.cpp @@ -77,7 +77,7 @@ void WebSocketsServerCore::begin(void) { // all its members are initialized to their default value, // except the ones explicitly detailed in WSclient_t() constructor. // Then we need to initialize some members to non-trivial values: - for (int i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) { + for (int i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) { _clients[i].init(i, _pingInterval, _pongTimeout, _disconnectTimeoutCount); } @@ -913,7 +913,7 @@ void WebSocketsServer::begin(void) { } void WebSocketsServer::close(void) { - WebSocketsServer::close(); + WebSocketsServerCore::close(); #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) _server->close(); #elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)