Skip to content

Commit dfa35fa

Browse files
Links2004Links2004
committed
clang-format
1 parent 794163c commit dfa35fa

File tree

2 files changed

+48
-57
lines changed

2 files changed

+48
-57
lines changed

‎src/SocketIOclient.cpp

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010
#include "SocketIOclient.h"
1111

1212
SocketIOclient::SocketIOclient() {
13-
1413
}
1514

1615
SocketIOclient::~SocketIOclient() {
17-
1816
}
1917

20-
void SocketIOclient::begin(const char *host, uint16_t port, const char * url, const char * protocol) {
18+
void SocketIOclient::begin(const char * host, uint16_t port, const char * url, const char * protocol) {
2119
WebSocketsClient::beginSocketIO(host, port, url, protocol);
2220
}
2321

@@ -40,20 +38,19 @@ bool SocketIOclient::isConnected(void) {
4038
bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPayload) {
4139
bool ret = false;
4240
if(length == 0) {
43-
length = strlen((const char *) payload);
41+
length = strlen((const char *)payload);
4442
}
4543
if(clientIsConnected(&_client)) {
46-
4744
if(!headerToPayload) {
4845
// webSocket Header
4946
ret = WebSocketsClient::sendFrameHeader(&_client, WSop_text, length + 2, true);
5047
// Engine.IO / Socket.IO Header
5148
if(ret) {
5249
uint8_t buf[3] = { eIOtype_MESSAGE, sIOtype_EVENT, 0x00 };
53-
ret = WebSocketsClient::write(&_client, buf, 2);
50+
ret = WebSocketsClient::write(&_client, buf, 2);
5451
}
5552
if(ret) {
56-
ret = WebSocketsClient::write(&_client, payload, length );
53+
ret = WebSocketsClient::write(&_client, payload, length);
5754
}
5855
return ret;
5956
} else {
@@ -66,19 +63,19 @@ bool SocketIOclient::sendEVENT(uint8_t * payload, size_t length, bool headerToPa
6663
}
6764

6865
bool SocketIOclient::sendEVENT(const uint8_t * payload, size_t length) {
69-
return sendEVENT((uint8_t *) payload, length);
66+
return sendEVENT((uint8_t *)payload, length);
7067
}
7168

7269
bool SocketIOclient::sendEVENT(char * payload, size_t length, bool headerToPayload) {
73-
return sendEVENT((uint8_t *) payload, length, headerToPayload);
70+
return sendEVENT((uint8_t *)payload, length, headerToPayload);
7471
}
7572

7673
bool SocketIOclient::sendEVENT(const char * payload, size_t length) {
77-
return sendEVENT((uint8_t *) payload, length);
74+
return sendEVENT((uint8_t *)payload, length);
7875
}
7976

8077
bool SocketIOclient::sendEVENT(String & payload) {
81-
return sendEVENT((uint8_t *) payload.c_str(), payload.length());
78+
return sendEVENT((uint8_t *)payload.c_str(), payload.length());
8279
}
8380

8481
void SocketIOclient::loop(void) {
@@ -100,15 +97,13 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
10097
// send message to server when Connected
10198
// Engine.io upgrade confirmation message (required)
10299
WebSocketsClient::sendTXT(eIOtype_UPGRADE);
103-
}
104-
break;
100+
} break;
105101
case WStype_TEXT: {
106-
107102
if(length < 1) {
108103
break;
109104
}
110105

111-
engineIOmessageType_t eType = (engineIOmessageType_t) payload[0];
106+
engineIOmessageType_t eType = (engineIOmessageType_t)payload[0];
112107
switch(eType) {
113108
case eIOtype_PING:
114109
payload[0] = eIOtype_PONG;
@@ -122,9 +117,9 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
122117
if(length < 2) {
123118
break;
124119
}
125-
socketIOmessageType_t ioType = (socketIOmessageType_t) payload[1];
126-
uint8_t * data = &payload[2];
127-
size_t lData = length - 2;
120+
socketIOmessageType_t ioType = (socketIOmessageType_t)payload[1];
121+
uint8_t * data = &payload[2];
122+
size_t lData = length - 2;
128123
switch(ioType) {
129124
case sIOtype_EVENT:
130125
DEBUG_WEBSOCKETS("[wsIOc] get event (%d): %s\n", lData, data);
@@ -141,8 +136,7 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
141136
break;
142137
}
143138

144-
}
145-
break;
139+
} break;
146140
case eIOtype_OPEN:
147141
case eIOtype_CLOSE:
148142
case eIOtype_UPGRADE:
@@ -155,8 +149,7 @@ void SocketIOclient::runCbEvent(WStype_t type, uint8_t * payload, size_t length)
155149

156150
// send message to server
157151
// webSocket.sendTXT("message here");
158-
}
159-
break;
152+
} break;
160153
case WStype_BIN:
161154
DEBUG_WEBSOCKETS("[wsIOc] get binary length: %u\n", length);
162155
// hexdump(payload, length);

‎src/SocketIOclient.h

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,58 +12,56 @@
1212

1313
#define EIO_HEARTBEAT_INTERVAL 10000
1414

15-
#define EIO_MAX_HEADER_SIZE (WEBSOCKETS_MAX_HEADER_SIZE + 1)
16-
#define SIO_MAX_HEADER_SIZE (EIO_MAX_HEADER_SIZE + 1)
15+
#define EIO_MAX_HEADER_SIZE (WEBSOCKETS_MAX_HEADER_SIZE + 1)
16+
#define SIO_MAX_HEADER_SIZE (EIO_MAX_HEADER_SIZE + 1)
1717

1818
typedef enum {
19-
eIOtype_OPEN = '0', ///< Sent from the server when a new transport is opened (recheck)
20-
eIOtype_CLOSE = '1', ///< Request the close of this transport but does not shutdown the connection itself.
21-
eIOtype_PING = '2', ///< Sent by the client. Server should answer with a pong packet containing the same data
22-
eIOtype_PONG = '3', ///< Sent by the server to respond to ping packets.
23-
eIOtype_MESSAGE = '4', ///< actual message, client and server should call their callbacks with the data
24-
eIOtype_UPGRADE = '5', ///< Before engine.io switches a transport, it tests, if server and client can communicate over this transport. If this test succeed, the client sends an upgrade packets which requests the server to flush its cache on the old transport and switch to the new transport.
25-
eIOtype_NOOP = '6', ///< A noop packet. Used primarily to force a poll cycle when an incoming websocket connection is received.
19+
eIOtype_OPEN = '0', ///< Sent from the server when a new transport is opened (recheck)
20+
eIOtype_CLOSE = '1', ///< Request the close of this transport but does not shutdown the connection itself.
21+
eIOtype_PING = '2', ///< Sent by the client. Server should answer with a pong packet containing the same data
22+
eIOtype_PONG = '3', ///< Sent by the server to respond to ping packets.
23+
eIOtype_MESSAGE = '4', ///< actual message, client and server should call their callbacks with the data
24+
eIOtype_UPGRADE = '5', ///< Before engine.io switches a transport, it tests, if server and client can communicate over this transport. If this test succeed, the client sends an upgrade packets which requests the server to flush its cache on the old transport and switch to the new transport.
25+
eIOtype_NOOP = '6', ///< A noop packet. Used primarily to force a poll cycle when an incoming websocket connection is received.
2626
} engineIOmessageType_t;
2727

28-
2928
typedef enum {
30-
sIOtype_CONNECT = '0',
31-
sIOtype_DISCONNECT = '1',
32-
sIOtype_EVENT = '2',
33-
sIOtype_ACK = '3',
34-
sIOtype_ERROR = '4',
29+
sIOtype_CONNECT = '0',
30+
sIOtype_DISCONNECT = '1',
31+
sIOtype_EVENT = '2',
32+
sIOtype_ACK = '3',
33+
sIOtype_ERROR = '4',
3534
sIOtype_BINARY_EVENT = '5',
36-
sIOtype_BINARY_ACK = '6',
35+
sIOtype_BINARY_ACK = '6',
3736
} socketIOmessageType_t;
3837

39-
class SocketIOclient: protected WebSocketsClient {
40-
41-
public:
38+
class SocketIOclient : protected WebSocketsClient {
39+
public:
4240
#ifdef __AVR__
43-
typedef void (*SocketIOclientEvent)(WStype_t type, uint8_t * payload, size_t length);
41+
typedef void (*SocketIOclientEvent)(WStype_t type, uint8_t * payload, size_t length);
4442
#else
45-
typedef std::function<void (WStype_t type, uint8_t * payload, size_t length)> SocketIOclientEvent;
43+
typedef std::function<void(WStype_t type, uint8_t * payload, size_t length)> SocketIOclientEvent;
4644
#endif
4745

48-
SocketIOclient(void);
49-
virtual ~SocketIOclient(void);
46+
SocketIOclient(void);
47+
virtual ~SocketIOclient(void);
5048

51-
void begin(const char *host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
52-
void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
49+
void begin(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", const char * protocol = "arduino");
50+
void begin(String host, uint16_t port, String url = "/socket.io/?EIO=3", String protocol = "arduino");
5351

54-
bool isConnected(void);
52+
bool isConnected(void);
5553

56-
bool sendEVENT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
57-
bool sendEVENT(const uint8_t * payload, size_t length = 0);
58-
bool sendEVENT(char * payload, size_t length = 0, bool headerToPayload = false);
59-
bool sendEVENT(const char * payload, size_t length = 0);
60-
bool sendEVENT(String & payload);
54+
bool sendEVENT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
55+
bool sendEVENT(const uint8_t * payload, size_t length = 0);
56+
bool sendEVENT(char * payload, size_t length = 0, bool headerToPayload = false);
57+
bool sendEVENT(const char * payload, size_t length = 0);
58+
bool sendEVENT(String & payload);
6159

62-
void loop(void);
60+
void loop(void);
6361

64-
protected:
65-
void runCbEvent(WStype_t type, uint8_t * payload, size_t length);
66-
uint64_t _lastHeartbeat = 0;
62+
protected:
63+
void runCbEvent(WStype_t type, uint8_t * payload, size_t length);
64+
uint64_t _lastHeartbeat = 0;
6765
};
6866

6967
#endif /* SOCKETIOCLIENT_H_ */

0 commit comments

Comments
 (0)