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

less ram usage when using strings

Browse Source
This commit is contained in:
Markus Sattler
2016-02-06 19:21:24 +01:00
parent 2b6f1909d7
commit 2d87bfa3d6
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WebSockets.cpp
View File

@ -473,7 +473,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
* @param clientKey String * @param clientKey String
* @return String Accept Key * @return String Accept Key
*/ */
String WebSockets::acceptKey(String clientKey) { String WebSockets::acceptKey(String & clientKey) {
uint8_t sha1HashBin[20] = { 0 }; uint8_t sha1HashBin[20] = { 0 };
#ifdef ESP8266 #ifdef ESP8266
sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]); sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);

2
src/WebSockets.h
View File

@ -212,7 +212,7 @@ class WebSockets {
void handleWebsocketCb(WSclient_t * client); void handleWebsocketCb(WSclient_t * client);
void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload); void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload);
String acceptKey(String clientKey); String acceptKey(String & clientKey);
String base64_encode(uint8_t * data, size_t length); String base64_encode(uint8_t * data, size_t length);
bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb); bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb);

2
src/WebSocketsClient.cpp
View File

@ -171,7 +171,7 @@ void WebSocketsClient::sendTXT(const char * payload, size_t length) {
sendTXT((uint8_t *) payload, length); sendTXT((uint8_t *) payload, length);
} }
void WebSocketsClient::sendTXT(String payload) { void WebSocketsClient::sendTXT(String & payload) {
sendTXT((uint8_t *) payload.c_str(), payload.length()); sendTXT((uint8_t *) payload.c_str(), payload.length());
} }

2
src/WebSocketsClient.h
View File

@ -61,7 +61,7 @@ class WebSocketsClient: private WebSockets {
void sendTXT(const uint8_t * payload, size_t length = 0); void sendTXT(const uint8_t * payload, size_t length = 0);
void sendTXT(char * payload, size_t length = 0, bool headerToPayload = false); void sendTXT(char * payload, size_t length = 0, bool headerToPayload = false);
void sendTXT(const char * payload, size_t length = 0); void sendTXT(const char * payload, size_t length = 0);
void sendTXT(String payload); void sendTXT(String & payload);
void sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false); void sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
void sendBIN(const uint8_t * payload, size_t length); void sendBIN(const uint8_t * payload, size_t length);

4
src/WebSocketsServer.cpp
View File

@ -148,7 +148,7 @@ void WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length)
sendTXT(num, (uint8_t *) payload, length); sendTXT(num, (uint8_t *) payload, length);
} }
void WebSocketsServer::sendTXT(uint8_t num, String payload) { void WebSocketsServer::sendTXT(uint8_t num, String & payload) {
sendTXT(num, (uint8_t *) payload.c_str(), payload.length()); sendTXT(num, (uint8_t *) payload.c_str(), payload.length());
} }
@ -187,7 +187,7 @@ void WebSocketsServer::broadcastTXT(const char * payload, size_t length) {
broadcastTXT((uint8_t *) payload, length); broadcastTXT((uint8_t *) payload, length);
} }
void WebSocketsServer::broadcastTXT(String payload) { void WebSocketsServer::broadcastTXT(String & payload) {
broadcastTXT((uint8_t *) payload.c_str(), payload.length()); broadcastTXT((uint8_t *) payload.c_str(), payload.length());
} }

4
src/WebSocketsServer.h
View File

@ -61,13 +61,13 @@ public:
void sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0); void sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0);
void sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false); void sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false);
void sendTXT(uint8_t num, const char * payload, size_t length = 0); void sendTXT(uint8_t num, const char * payload, size_t length = 0);
void sendTXT(uint8_t num, String payload); void sendTXT(uint8_t num, String & payload);
void broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false); void broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
void broadcastTXT(const uint8_t * payload, size_t length = 0); void broadcastTXT(const uint8_t * payload, size_t length = 0);
void broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false); void broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false);
void broadcastTXT(const char * payload, size_t length = 0); void broadcastTXT(const char * payload, size_t length = 0);
void broadcastTXT(String payload); void broadcastTXT(String & payload);
void sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false); void sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false);
void sendBIN(uint8_t num, const uint8_t * payload, size_t length); void sendBIN(uint8_t num, const uint8_t * payload, size_t length);