From 6eee4c6dc6740b6ccea96b04d4c7695ac1fc22ce Mon Sep 17 00:00:00 2001 From: Links2004 Date: Wed, 13 Aug 2025 19:24:49 +0200 Subject: [PATCH] clang-format --- src/WebSockets.cpp | 8 +++---- src/WebSockets.h | 26 +++++++++++----------- src/WebSockets4WebServer.h | 2 +- src/WebSocketsClient.cpp | 32 +++++++++++++-------------- src/WebSocketsClient.h | 8 +++---- src/WebSocketsServer.cpp | 44 +++++++++++++++++++------------------- src/WebSocketsServer.h | 12 +++++------ 7 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/WebSockets.cpp b/src/WebSockets.cpp index 2d3a254..9b9ca8f 100644 --- a/src/WebSockets.cpp +++ b/src/WebSockets.cpp @@ -42,7 +42,7 @@ extern "C" { #include #if ESP_IDF_VERSION_MAJOR >= 4 -#if(ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(1, 0, 6)) +#if (ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(1, 0, 6)) #include "sha/sha_parallel_engine.h" #else #include @@ -328,7 +328,7 @@ void WebSockets::headerDone(WSclient_t * client) { client->status = WSC_CONNECTED; client->cWsRXsize = 0; DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done.\n", client->num); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->cHttpLine = ""; handleWebsocket(client); #endif @@ -525,7 +525,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t // reset input client->cWsRXsize = 0; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) // register callback for next message handleWebsocketWaitFor(client, 2); #endif @@ -594,7 +594,7 @@ String WebSockets::base64_encode(uint8_t * data, size_t length) { * @return true if ok */ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWaitCb cb) { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) if(!client->tcp || !client->tcp->connected()) { return false; } diff --git a/src/WebSockets.h b/src/WebSockets.h index d5d08e1..51ee3ef 100644 --- a/src/WebSockets.h +++ b/src/WebSockets.h @@ -170,7 +170,7 @@ #endif // Includes and defined based on Network Type -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) // Note: // No SSL/WSS support for client in Async mode @@ -193,7 +193,7 @@ #define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer #define WEBSOCKETS_NETWORK_SERVER_CLASS AsyncServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) #if !defined(ESP8266) && !defined(ESP31B) #error "network type ESP8266 only possible on the ESP mcu!" @@ -213,7 +213,7 @@ #define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100) #ifdef STM32_DEVICE #define WEBSOCKETS_NETWORK_CLASS TCPClient @@ -225,13 +225,13 @@ #define WEBSOCKETS_NETWORK_SERVER_CLASS EthernetServer #endif -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60) #include #define WEBSOCKETS_NETWORK_CLASS UIPClient #define WEBSOCKETS_NETWORK_SERVER_CLASS UIPServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) #include #include @@ -240,13 +240,13 @@ #define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32_ETH) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32_ETH) #include #define WEBSOCKETS_NETWORK_CLASS WiFiClient #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) #include #include @@ -255,13 +255,13 @@ #define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) #include #define WEBSOCKETS_NETWORK_CLASS WiFiClient #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) #if __has_include() #include #else @@ -272,7 +272,7 @@ #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer #define WEBSOCKETS_NETWORK_SSL_CLASS WiFiSSLClient -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) #if __has_include() && __has_include() #include #include @@ -287,7 +287,7 @@ #define WEBSOCKETS_NETWORK_CLASS WiFiClient #define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_CUSTOM) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_CUSTOM) #include #include @@ -376,7 +376,7 @@ typedef struct { bool isSocketIO = false; ///< client for socket.io server #if defined(HAS_SSL) - bool isSSL = false; ///< run in ssl mode + bool isSSL = false; ///< run in ssl mode WEBSOCKETS_NETWORK_SSL_CLASS * ssl = nullptr; #endif @@ -413,7 +413,7 @@ typedef struct { uint8_t disconnectTimeoutCount = 0; // after how many subsequent pong timeouts discconnect will happen, 0 means "do not disconnect" uint8_t pongTimeoutCount = 0; // current pong timeout count -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) String cHttpLine; ///< HTTP header lines #endif diff --git a/src/WebSockets4WebServer.h b/src/WebSockets4WebServer.h index 595f38b..b2eddcc 100644 --- a/src/WebSockets4WebServer.h +++ b/src/WebSockets4WebServer.h @@ -28,7 +28,7 @@ #include #include -#if((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK +#if ((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK class WebSockets4WebServer : public WebSocketsServerCore { #if defined(ESP8266) diff --git a/src/WebSocketsClient.cpp b/src/WebSocketsClient.cpp index 1c38305..60a47d3 100644 --- a/src/WebSocketsClient.cpp +++ b/src/WebSocketsClient.cpp @@ -88,7 +88,7 @@ void WebSocketsClient::begin(const char * host, uint16_t port, const char * url, // todo find better seed randomSeed(millis()); #endif -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) asyncConnect(); #endif @@ -225,7 +225,7 @@ void WebSocketsClient::beginSocketIOSSLWithCA(const char * host, uint16_t port, #endif -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) /** * called in arduino loop */ @@ -244,7 +244,7 @@ void WebSocketsClient::loop(void) { if(_client.isSSL) { DEBUG_WEBSOCKETS("[WS-Client] connect wss...\n"); if(_client.ssl) { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) // does not support delete (no destructor) #else delete _client.ssl; @@ -261,7 +261,7 @@ void WebSocketsClient::loop(void) { _client.ssl->setCACert(_CA_cert); #elif defined(ESP8266) && defined(SSL_AXTLS) _client.ssl->setCACert((const uint8_t *)_CA_cert, strlen(_CA_cert) + 1); -#elif(defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL) +#elif (defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL) _client.ssl->setTrustAnchors(_CA_cert); #elif defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0) _client.ssl->setCACert(_CA_cert); @@ -294,7 +294,7 @@ void WebSocketsClient::loop(void) { } else { DEBUG_WEBSOCKETS("[WS-Client] connect ws...\n"); if(_client.tcp) { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) // does not support delete (no destructor) #else delete _client.tcp; @@ -540,16 +540,16 @@ void WebSocketsClient::clientDisconnect(WSclient_t * client) { if(client->tcp) { if(client->tcp->connected()) { -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) client->tcp->flush(); #endif client->tcp->stop(); } event = true; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->status = WSC_NOT_CONNECTED; #else -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4) // does not support delete (no destructor) #else delete client->tcp; @@ -605,7 +605,7 @@ bool WebSocketsClient::clientIsConnected(WSclient_t * client) { return false; } -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) /** * Handel incomming data from Client */ @@ -726,7 +726,7 @@ void WebSocketsClient::sendHeader(WSclient_t * client) { DEBUG_WEBSOCKETS("[WS-Client][sendHeader] handshake %s", (uint8_t *)handshake.c_str()); write(client, (uint8_t *)handshake.c_str(), handshake.length()); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine))); #endif @@ -801,7 +801,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) { } (*headerLine) = ""; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine))); #endif } else { @@ -871,7 +871,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) { headerDone(client); runCbEvent(WStype_CONNECTED, (uint8_t *)client->cUrl.c_str(), client->cUrl.length()); -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) } else if(client->isSocketIO) { if(client->cSessionId.length() > 0) { DEBUG_WEBSOCKETS("[WS-Client][handleHeader] found cSessionId\n"); @@ -899,7 +899,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) { void WebSocketsClient::connectedCb() { DEBUG_WEBSOCKETS("[WS-Client] connected to %s:%u.\n", _host.c_str(), _port); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) _client.tcp->onDisconnect(std::bind([](WebSocketsClient * c, AsyncTCPbuffer * obj, WSclient_t * client) -> bool { DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num); client->status = WSC_NOT_CONNECTED; @@ -915,12 +915,12 @@ void WebSocketsClient::connectedCb() { _client.status = WSC_HEADER; -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) // set Timeout for readBytesUntil and readStringUntil _client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT); #endif -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) _client.tcp->setNoDelay(true); #endif @@ -950,7 +950,7 @@ void WebSocketsClient::connectFailedCb() { DEBUG_WEBSOCKETS("[WS-Client] connection to %s:%u Failed\n", _host.c_str(), _port); } -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) void WebSocketsClient::asyncConnect() { DEBUG_WEBSOCKETS("[WS-Client] asyncConnect...\n"); diff --git a/src/WebSocketsClient.h b/src/WebSocketsClient.h index e60088b..8294b3c 100644 --- a/src/WebSocketsClient.h +++ b/src/WebSocketsClient.h @@ -77,7 +77,7 @@ class WebSocketsClient : protected WebSockets { #endif #endif -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void loop(void); #else // Async interface not need a loop call @@ -140,7 +140,7 @@ class WebSocketsClient : protected WebSockets { #define SSL_FINGERPRINT_NULL NULL #endif -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) const char * _CA_cert; const uint8_t * _CA_bundle; #endif @@ -159,7 +159,7 @@ class WebSocketsClient : protected WebSockets { void clientDisconnect(WSclient_t * client); bool clientIsConnected(WSclient_t * client); -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void handleClientData(void); #endif @@ -171,7 +171,7 @@ class WebSocketsClient : protected WebSockets { void handleHBPing(); // send ping in specified intervals -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) void asyncConnect(); #endif diff --git a/src/WebSocketsServer.cpp b/src/WebSocketsServer.cpp index d3857e6..9d64c3a 100644 --- a/src/WebSocketsServer.cpp +++ b/src/WebSocketsServer.cpp @@ -54,7 +54,7 @@ WebSocketsServer::WebSocketsServer(uint16_t port, const String & origin, const S _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) _server->onClient([](void * s, AsyncClient * c) { ((WebSocketsServerCore *)s)->newClient(new AsyncTCPbuffer(c)); }, @@ -73,7 +73,7 @@ WebSocketsServerCore::~WebSocketsServerCore() { } WebSocketsServer::~WebSocketsServer() { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) // does not support delete (no destructor) #else delete _server; @@ -411,7 +411,7 @@ bool WebSocketsServerCore::clientIsConnected(uint8_t num) { return clientIsConnected(client); } -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) /** * get an IP for a client * @param num uint8_t client id @@ -445,7 +445,7 @@ WSclient_t * WebSocketsServerCore::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclien // look for match to existing socket before creating a new one if(clientIsConnected(client)) { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100) // Check to see if it is the same socket - if so, return it if(client->tcp->getSocketNumber() == TCPclient->getSocketNumber()) { return client; @@ -455,16 +455,16 @@ WSclient_t * WebSocketsServerCore::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclien // state is not connected or tcp connection is lost client->tcp = TCPclient; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) client->isSSL = false; client->tcp->setNoDelay(true); #endif -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) // set Timeout for readBytesUntil and readStringUntil client->tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT); #endif client->status = WSC_HEADER; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) #ifndef NODEBUG_WEBSOCKETS IPAddress ip = client->tcp->remoteIP(); #endif @@ -473,7 +473,7 @@ WSclient_t * WebSocketsServerCore::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclien DEBUG_WEBSOCKETS("[WS-Server][%d] new client\n", client->num); #endif -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->tcp->onDisconnect(std::bind([](WebSocketsServerCore * server, AsyncTCPbuffer * obj, WSclient_t * client) -> bool { DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num); @@ -546,14 +546,14 @@ void WebSocketsServerCore::dropNativeClient(WSclient_t * client) { } if(client->tcp) { if(client->tcp->connected()) { -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP32) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP32) && (WEBSOCKETS_NETWORK_TYPE != NETWORK_RP2040) client->tcp->flush(); #endif client->tcp->stop(); } -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->status = WSC_NOT_CONNECTED; -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) // does not support delete (no destructor) #else delete client->tcp; @@ -567,7 +567,7 @@ void WebSocketsServerCore::dropNativeClient(WSclient_t * client) { * @param client WSclient_t * ptr to the client struct */ void WebSocketsServerCore::clientDisconnect(WSclient_t * client) { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) if(client->isSSL && client->ssl) { if(client->ssl->connected()) { client->ssl->flush(); @@ -590,7 +590,7 @@ void WebSocketsServerCore::clientDisconnect(WSclient_t * client) { client->cWsRXsize = 0; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->cHttpLine = ""; #endif @@ -632,7 +632,7 @@ bool WebSocketsServerCore::clientIsConnected(WSclient_t * client) { return false; } -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) /** * Handle incoming Connection Request */ @@ -641,7 +641,7 @@ WSclient_t * WebSocketsServerCore::handleNewClient(WEBSOCKETS_NETWORK_CLASS * tc if(!client) { // no free space to handle client -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) #ifndef NODEBUG_WEBSOCKETS IPAddress ip = tcpClient->remoteIP(); #endif @@ -666,12 +666,12 @@ WSclient_t * WebSocketsServerCore::handleNewClient(WEBSOCKETS_NETWORK_CLASS * tc * Handle incoming Connection Request */ void WebSocketsServer::handleNewClients(void) { -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) while(_server->hasClient()) { #endif // store new connection -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available()); #else WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->accept()); @@ -684,7 +684,7 @@ void WebSocketsServer::handleNewClients(void) { handleNewClient(tcpClient); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) } #endif } @@ -798,7 +798,7 @@ void WebSocketsServerCore::handleHeader(WSclient_t * client, String * headerLine } (*headerLine) = ""; -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServerCore::handleHeader, this, client, &(client->cHttpLine))); #endif } else { @@ -955,16 +955,16 @@ void WebSocketsServer::begin(void) { void WebSocketsServer::close(void) { WebSocketsServerCore::close(); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) _server->close(); -#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) +#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) _server->end(); #else // TODO how to close server? #endif } -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) /** * called in arduino loop */ diff --git a/src/WebSocketsServer.h b/src/WebSocketsServer.h index 197c37f..25b0427 100644 --- a/src/WebSocketsServer.h +++ b/src/WebSocketsServer.h @@ -90,11 +90,11 @@ class WebSocketsServerCore : protected WebSockets { void enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount); void disableHeartbeat(); -#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) +#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040) IPAddress remoteIP(uint8_t num); #endif -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void loop(void); // handle client data only #endif @@ -123,7 +123,7 @@ class WebSocketsServerCore : protected WebSockets { void clientDisconnect(WSclient_t * client); bool clientIsConnected(WSclient_t * client); -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void handleClientData(void); #endif @@ -199,7 +199,7 @@ class WebSocketsServerCore : protected WebSockets { return true; } -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) WSclient_t * handleNewClient(WEBSOCKETS_NETWORK_CLASS * tcpClient); #endif @@ -224,7 +224,7 @@ class WebSocketsServer : public WebSocketsServerCore { void begin(void); void close(void); -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void loop(void); // handle incoming client and client data #else // Async interface not need a loop call @@ -232,7 +232,7 @@ class WebSocketsServer : public WebSocketsServerCore { #endif protected: -#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) +#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void handleNewClients(void); #endif