Links2004/arduinoWebSockets
1
0
Fork 1
mirror of https://github.com/Links2004/arduinoWebSockets.git synced 2025-07-12 23:16:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

no need to store the Sec-WebSocket-Accept key if needed can be generated by acceptKey from client Sec-WebSocket-Key

Browse Source
This commit is contained in:
Markus Sattler
2015-05-23 09:34:09 +02:00
parent 0ca1503e52
commit 44c00d2dd9
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WebSockets.h
View File

@ -86,8 +86,6 @@ typedef struct {
String cExtensions; ///< client Sec-WebSocket-Extensions String cExtensions; ///< client Sec-WebSocket-Extensions
int cVersion; ///< client Sec-WebSocket-Version int cVersion; ///< client Sec-WebSocket-Version
String sKey; ///< server Sec-WebSocket-Key
} WSclient_t; } WSclient_t;
class WebSockets { class WebSockets {

10
src/WebSocketsServer.cpp
View File

@ -55,8 +55,6 @@ void WebSocketsServer::begin(void) {
client->cIsUpgrade = false; client->cIsUpgrade = false;
client->cIsWebsocket = false; client->cIsWebsocket = false;
client->sKey = "";
client->status = WSC_NOT_CONNECTED; client->status = WSC_NOT_CONNECTED;
} }
@ -259,8 +257,6 @@ void WebSocketsServer::clientDisconnect(WSclient_t * client) {
client->cIsUpgrade = false; client->cIsUpgrade = false;
client->cIsWebsocket = false; client->cIsWebsocket = false;
client->sKey = "";
client->status = WSC_NOT_CONNECTED; client->status = WSC_NOT_CONNECTED;
DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num); DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num);
@ -422,9 +418,9 @@ void WebSocketsServer::handleHeader(WSclient_t * client) {
DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incomming.\n", client->num); DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incomming.\n", client->num);
// generate Sec-WebSocket-Accept key // generate Sec-WebSocket-Accept key
client->sKey = acceptKey(client->cKey); String sKey = acceptKey(client->cKey);
DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] - sKey: %s\n", client->num, client->sKey.c_str()); DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] - sKey: %s\n", client->num, sKey.c_str());
client->status = WSC_CONNECTED; client->status = WSC_CONNECTED;
@ -434,7 +430,7 @@ void WebSocketsServer::handleHeader(WSclient_t * client) {
"Connection: Upgrade\r\n" "Connection: Upgrade\r\n"
"Sec-WebSocket-Version: 13\r\n" "Sec-WebSocket-Version: 13\r\n"
"Sec-WebSocket-Accept: "); "Sec-WebSocket-Accept: ");
client->tcp.write(client->sKey.c_str(), client->sKey.length()); client->tcp.write(sKey.c_str(), sKey.length());
client->tcp.write("\r\n"); client->tcp.write("\r\n");
if(client->cProtocol.length() > 0) { if(client->cProtocol.length() > 0) {