Skip to content

Commit 44c00d2

Browse files
committed
no need to store the Sec-WebSocket-Accept key if needed can be generated by acceptKey from client Sec-WebSocket-Key
1 parent 0ca1503 commit 44c00d2

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/WebSockets.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ typedef struct {
8686
String cExtensions; ///< client Sec-WebSocket-Extensions
8787
int cVersion; ///< client Sec-WebSocket-Version
8888

89-
String sKey; ///< server Sec-WebSocket-Key
90-
9189
} WSclient_t;
9290

9391
class WebSockets {

src/WebSocketsServer.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ void WebSocketsServer::begin(void) {
5555
client->cIsUpgrade = false;
5656
client->cIsWebsocket = false;
5757

58-
client->sKey = "";
59-
6058
client->status = WSC_NOT_CONNECTED;
6159
}
6260

@@ -259,8 +257,6 @@ void WebSocketsServer::clientDisconnect(WSclient_t * client) {
259257
client->cIsUpgrade = false;
260258
client->cIsWebsocket = false;
261259

262-
client->sKey = "";
263-
264260
client->status = WSC_NOT_CONNECTED;
265261

266262
DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num);
@@ -422,9 +418,9 @@ void WebSocketsServer::handleHeader(WSclient_t * client) {
422418
DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incomming.\n", client->num);
423419

424420
// generate Sec-WebSocket-Accept key
425-
client->sKey = acceptKey(client->cKey);
421+
String sKey = acceptKey(client->cKey);
426422

427-
DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] - sKey: %s\n", client->num, client->sKey.c_str());
423+
DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] - sKey: %s\n", client->num, sKey.c_str());
428424

429425
client->status = WSC_CONNECTED;
430426

@@ -434,7 +430,7 @@ void WebSocketsServer::handleHeader(WSclient_t * client) {
434430
"Connection: Upgrade\r\n"
435431
"Sec-WebSocket-Version: 13\r\n"
436432
"Sec-WebSocket-Accept: ");
437-
client->tcp.write(client->sKey.c_str(), client->sKey.length());
433+
client->tcp.write(sKey.c_str(), sKey.length());
438434
client->tcp.write("\r\n");
439435

440436
if(client->cProtocol.length() > 0) {

0 commit comments

Comments
 (0)