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

clang-format

Browse Source
This commit is contained in:
Links
2019-06-10 13:31:51 +02:00
parent 794163cec9
commit dfa35fa9ae
2 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/SocketIOclient.cpp
View File

@ -10,14 +10,12 @@
#include "SocketIOclient.h" #include "SocketIOclient.h"
SocketIOclient::SocketIOclient() { SocketIOclient::SocketIOclient() {
} }
SocketIOclient::~SocketIOclient() { SocketIOclient::~SocketIOclient() {
} }
void SocketIOclient::begin(const char *host, uint16_t port, const char * url, const char * protocol) { void SocketIOclient::begin(const char * host, uint16_t port, const char * url, const char * protocol) {
WebSocketsClient::beginSocketIO(host, port, url, protocol); WebSocketsClient::beginSocketIO(host, port, url, protocol);
} }
@ -40,10 +38,9 @@ bool SocketIOclient::isConnected(void) {
bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPayload) { bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPayload) {
bool ret = false; bool ret = false;
if(length == 0) { if(length == 0) {
length = strlen((const char *) payload); length = strlen((const char *)payload);
} }
if(clientIsConnected(&_client)) { if(clientIsConnected(&_client)) {
if(!headerToPayload) { if(!headerToPayload) {
// webSocket Header // webSocket Header
ret = WebSocketsClient::sendFrameHeader(&_client, WSop_text, length + 2, true); ret = WebSocketsClient::sendFrameHeader(&_client, WSop_text, length + 2, true);
@ -53,7 +50,7 @@ bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPa
ret = WebSocketsClient::write(&_client, buf, 2); ret = WebSocketsClient::write(&_client, buf, 2);
} }
if(ret) { if(ret) {
ret = WebSocketsClient::write(&_client, payload, length ); ret = WebSocketsClient::write(&_client, payload, length);
} }
return ret; return ret;
} else { } else {
@ -66,19 +63,19 @@ bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPa
} }
bool SocketIOclient::sendEVENT(const uint8_t * payload, size_t length) { bool SocketIOclient::sendEVENT(const uint8_t * payload, size_t length) {
return sendEVENT((uint8_t *) payload, length); return sendEVENT((uint8_t *)payload, length);
} }
bool SocketIOclient::sendEVENT(char * payload, size_t length, bool headerToPayload) { bool SocketIOclient::sendEVENT(char * payload, size_t length, bool headerToPayload) {
return sendEVENT((uint8_t *) payload, length, headerToPayload); return sendEVENT((uint8_t *)payload, length, headerToPayload);
} }
bool SocketIOclient::sendEVENT(const char * payload, size_t length) { bool SocketIOclient::sendEVENT(const char * payload, size_t length) {
return sendEVENT((uint8_t *) payload, length); return sendEVENT((uint8_t *)payload, length);
} }
bool SocketIOclient::sendEVENT(String & payload) { bool SocketIOclient::sendEVENT(String & payload) {
return sendEVENT((uint8_t *) payload.c_str(), payload.length()); return sendEVENT((uint8_t *)payload.c_str(), payload.length());
} }
void SocketIOclient::loop(void) { void SocketIOclient::loop(void) {
@ -100,15 +97,13 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
// send message to server when Connected // send message to server when Connected
// Engine.io upgrade confirmation message (required) // Engine.io upgrade confirmation message (required)
WebSocketsClient::sendTXT(eIOtype_UPGRADE); WebSocketsClient::sendTXT(eIOtype_UPGRADE);
} } break;
break;
case WStype_TEXT: { case WStype_TEXT: {
if(length < 1) { if(length < 1) {
break; break;
} }
engineIOmessageType_t eType = (engineIOmessageType_t) payload[0]; engineIOmessageType_t eType = (engineIOmessageType_t)payload[0];
switch(eType) { switch(eType) {
case eIOtype_PING: case eIOtype_PING:
payload[0] = eIOtype_PONG; payload[0] = eIOtype_PONG;
@ -122,7 +117,7 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
if(length < 2) { if(length < 2) {
break; break;
} }
socketIOmessageType_t ioType = (socketIOmessageType_t) payload[1]; socketIOmessageType_t ioType = (socketIOmessageType_t)payload[1];
uint8_t * data = &payload[2]; uint8_t * data = &payload[2];
size_t lData = length - 2; size_t lData = length - 2;
switch(ioType) { switch(ioType) {
@ -141,8 +136,7 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
break; break;
} }
} } break;
break;
case eIOtype_OPEN: case eIOtype_OPEN:
case eIOtype_CLOSE: case eIOtype_CLOSE:
case eIOtype_UPGRADE: case eIOtype_UPGRADE:
@ -155,8 +149,7 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
// send message to server // send message to server
// webSocket.sendTXT("message here"); // webSocket.sendTXT("message here");
} } break;
break;
case WStype_BIN: case WStype_BIN:
DEBUG_WEBSOCKETS("[wsIOc] get binary length: %u\n", length); DEBUG_WEBSOCKETS("[wsIOc] get binary length: %u\n", length);
// hexdump(payload, length); // hexdump(payload, length);

8
src/SocketIOclient.h
View File

@ -25,7 +25,6 @@ typedef enum {
eIOtype_NOOP = '6', ///< A noop packet. Used primarily to force a poll cycle when an incoming websocket connection is received. eIOtype_NOOP = '6', ///< A noop packet. Used primarily to force a poll cycle when an incoming websocket connection is received.
} engineIOmessageType_t; } engineIOmessageType_t;
typedef enum { typedef enum {
sIOtype_CONNECT = '0', sIOtype_CONNECT = '0',
sIOtype_DISCONNECT = '1', sIOtype_DISCONNECT = '1',
@ -36,19 +35,18 @@ typedef enum {
sIOtype_BINARY_ACK = '6', sIOtype_BINARY_ACK = '6',
} socketIOmessageType_t; } socketIOmessageType_t;
class SocketIOclient: protected WebSocketsClient { class SocketIOclient : protected WebSocketsClient {
public: public:
#ifdef __AVR__ #ifdef __AVR__
typedef void (*SocketIOclientEvent)(WStype_t type, uint8_t * payload, size_t length); typedef void (*SocketIOclientEvent)(WStype_t type, uint8_t * payload, size_t length);
#else #else
typedef std::function<void (WStype_t type, uint8_t * payload, size_t length)> SocketIOclientEvent; typedef std::function<void(WStype_t type, uint8_t * payload, size_t length)> SocketIOclientEvent;
#endif #endif
SocketIOclient(void); SocketIOclient(void);
virtual ~SocketIOclient(void); virtual ~SocketIOclient(void);
void begin(const char *host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino"); void begin(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino"); void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
bool isConnected(void); bool isConnected(void);