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

code style

Browse Source
This commit is contained in:
Links
2020-05-03 09:28:55 +02:00
parent 80b0867786
commit 9048ef9ee4
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WebSockets.h
View File

@ -61,7 +61,7 @@
// moves all Header strings to Flash (~300 Byte) // moves all Header strings to Flash (~300 Byte)
//#define WEBSOCKETS_SAVE_RAM //#define WEBSOCKETS_SAVE_RAM
#if defined(ESP8266) #if defined(ESP8266)
#define WEBSOCKETS_YIELD() delay(0) #define WEBSOCKETS_YIELD() delay(0)
#elif defined(ESP32) #elif defined(ESP32)
#define WEBSOCKETS_YIELD() yield() #define WEBSOCKETS_YIELD() yield()

2
src/WebSocketsClient.cpp
View File

@ -30,7 +30,7 @@ WebSocketsClient::WebSocketsClient() {
_client.num = 0; _client.num = 0;
_client.cIsClient = true; _client.cIsClient = true;
_client.extraHeaders = WEBSOCKETS_STRING("Origin: file://"); _client.extraHeaders = WEBSOCKETS_STRING("Origin: file://");
_reconnectInterval = 500; _reconnectInterval = 500;
} }
WebSocketsClient::~WebSocketsClient() { WebSocketsClient::~WebSocketsClient() {

40
src/WebSocketsServer.cpp
View File

@ -26,12 +26,12 @@
#include "WebSocketsServer.h" #include "WebSocketsServer.h"
WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol) { WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol) {
_port = port; _port = port;
_origin = origin; _origin = origin;
_protocol = protocol; _protocol = protocol;
_runnning = false; _runnning = false;
_pingInterval = 0; _pingInterval = 0;
_pongTimeout = 0; _pongTimeout = 0;
_disconnectTimeoutCount = 0; _disconnectTimeoutCount = 0;
_server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port); _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port);
@ -95,8 +95,8 @@ void WebSocketsServer::begin(void) {
client->cHttpLine = ""; client->cHttpLine = "";
#endif #endif
client->pingInterval = _pingInterval; client->pingInterval = _pingInterval;
client->pongTimeout = _pongTimeout; client->pongTimeout = _pongTimeout;
client->disconnectTimeoutCount = _disconnectTimeoutCount; client->disconnectTimeoutCount = _disconnectTimeoutCount;
} }
@ -489,11 +489,11 @@ bool WebSocketsServer::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient) {
client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine))); client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
#endif #endif
client->pingInterval = _pingInterval; client->pingInterval = _pingInterval;
client->pongTimeout = _pongTimeout; client->pongTimeout = _pongTimeout;
client->disconnectTimeoutCount = _disconnectTimeoutCount; client->disconnectTimeoutCount = _disconnectTimeoutCount;
client->lastPing = millis(); client->lastPing = millis();
client->pongReceived = false; client->pongReceived = false;
return true; return true;
break; break;
@ -657,7 +657,7 @@ void WebSocketsServer::handleNewClients(void) {
} }
WEBSOCKETS_YIELD(); WEBSOCKETS_YIELD();
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) #if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
} }
#endif #endif
} }
@ -686,7 +686,7 @@ void WebSocketsServer::handleClientData(void) {
break; break;
} }
} }
handleHBPing(client); handleHBPing(client);
handleHBTimeout(client); handleHBTimeout(client);
} }
@ -873,7 +873,7 @@ void WebSocketsServer::handleHBPing(WSclient_t * client) {
return; return;
uint32_t pi = millis() - client->lastPing; uint32_t pi = millis() - client->lastPing;
if(pi > client->pingInterval) { if(pi > client->pingInterval) {
DEBUG_WEBSOCKETS("[WS-Server][%d] sending HB ping\n", client->num); DEBUG_WEBSOCKETS("[WS-Server][%d] sending HB ping\n", client->num);
if(sendPing(client->num)) { if(sendPing(client->num)) {
client->lastPing = millis(); client->lastPing = millis();
client->pongReceived = false; client->pongReceived = false;
@ -888,10 +888,10 @@ void WebSocketsServer::handleHBPing(WSclient_t * client) {
* @param disconnectTimeoutCount uint8_t how many timeouts before disconnect, 0=> do not disconnect * @param disconnectTimeoutCount uint8_t how many timeouts before disconnect, 0=> do not disconnect
*/ */
void WebSocketsServer::enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) { void WebSocketsServer::enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount) {
_pingInterval = pingInterval; _pingInterval = pingInterval;
_pongTimeout = pongTimeout; _pongTimeout = pongTimeout;
_disconnectTimeoutCount = disconnectTimeoutCount; _disconnectTimeoutCount = disconnectTimeoutCount;
WSclient_t * client; WSclient_t * client;
for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) { for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
client = &_clients[i]; client = &_clients[i];
@ -904,10 +904,10 @@ void WebSocketsServer::enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeo
*/ */
void WebSocketsServer::disableHeartbeat() { void WebSocketsServer::disableHeartbeat() {
_pingInterval = 0; _pingInterval = 0;
WSclient_t * client; WSclient_t * client;
for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) { for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
client = &_clients[i]; client = &_clients[i];
client->pingInterval = 0; client->pingInterval = 0;
} }
} }

6
src/WebSocketsServer.h
View File

@ -91,7 +91,7 @@ class WebSocketsServer : protected WebSockets {
void setAuthorization(const char * auth); void setAuthorization(const char * auth);
int connectedClients(bool ping = false); int connectedClients(bool ping = false);
void enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount); void enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount);
void disableHeartbeat(); void disableHeartbeat();
@ -115,7 +115,7 @@ class WebSocketsServer : protected WebSockets {
WebSocketServerHttpHeaderValFunc _httpHeaderValidationFunc; WebSocketServerHttpHeaderValFunc _httpHeaderValidationFunc;
bool _runnning; bool _runnning;
uint32_t _pingInterval; uint32_t _pingInterval;
uint32_t _pongTimeout; uint32_t _pongTimeout;
uint8_t _disconnectTimeoutCount; uint8_t _disconnectTimeoutCount;
@ -133,7 +133,7 @@ class WebSocketsServer : protected WebSockets {
#endif #endif
void handleHeader(WSclient_t * client, String * headerLine); void handleHeader(WSclient_t * client, String * headerLine);
void handleHBPing(WSclient_t * client); // send ping in specified intervals void handleHBPing(WSclient_t * client); // send ping in specified intervals
/** /**