code style

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

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;
@ -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,8 +888,8 @@ 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;
@ -907,7 +907,7 @@ void WebSocketsServer::disableHeartbeat() {
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;
} }
} }