Skip to content

Commit 56dfe3d

Browse files
fix clan format
1 parent 292f610 commit 56dfe3d

File tree

2 files changed

+72
-36
lines changed

2 files changed

+72
-36
lines changed

libraries/SocketWrapper/SocketWrapper.h

Lines changed: 69 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ class ZephyrSocketWrapper {
1717
int ssl_sock_temp_char = -1;
1818

1919
// custom deleter for shared_ptr to close automatically the socket
20-
static auto socket_deleter() {
21-
return [](int* fd) {
22-
if (fd && *fd != -1) {
23-
::close(*fd);
24-
delete fd;
25-
}
26-
};
27-
}
20+
static auto socket_deleter() {
21+
return [](int *fd) {
22+
if (fd && *fd != -1) {
23+
::close(*fd);
24+
delete fd;
25+
}
26+
};
27+
}
2828

2929
public:
3030
ZephyrSocketWrapper() = default;
3131

32-
ZephyrSocketWrapper(int fd)
33-
: sock_fd(std::shared_ptr<int>(new int(fd), socket_deleter())) {}
32+
ZephyrSocketWrapper(int fd) : sock_fd(std::shared_ptr<int>(new int(fd), socket_deleter())) {
33+
}
3434

3535
~ZephyrSocketWrapper() = default; // socket close managed by shared_ptr
3636

@@ -57,25 +57,33 @@ class ZephyrSocketWrapper {
5757
}
5858

5959
if (ret != 0) {
60-
if (res) freeaddrinfo(res);
60+
if (res) {
61+
freeaddrinfo(res);
62+
}
6163
return false;
6264
}
6365

6466
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
6567
if (raw_sock_fd < 0) {
66-
if (res) freeaddrinfo(res);
68+
if (res) {
69+
freeaddrinfo(res);
70+
}
6771
return false;
6872
}
6973

7074
sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
7175

7276
if (::connect(*sock_fd, res->ai_addr, res->ai_addrlen) < 0) {
7377
sock_fd.reset();
74-
if (res) freeaddrinfo(res);
78+
if (res) {
79+
freeaddrinfo(res);
80+
}
7581
return false;
7682
}
7783

78-
if (res) freeaddrinfo(res);
84+
if (res) {
85+
freeaddrinfo(res);
86+
}
7987
return true;
8088
}
8189

@@ -88,10 +96,12 @@ class ZephyrSocketWrapper {
8896
addr.sin_port = htons(port);
8997
inet_pton(AF_INET, _host, &addr.sin_addr);
9098

91-
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
92-
if (raw_sock_fd < 0) return false;
99+
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
100+
if (raw_sock_fd < 0) {
101+
return false;
102+
}
93103

94-
sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
104+
sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
95105

96106
if (::connect(*sock_fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
97107
sock_fd.reset();
@@ -134,42 +144,54 @@ class ZephyrSocketWrapper {
134144
}
135145

136146
if (ret != 0) {
137-
if (res) freeaddrinfo(res);
147+
if (res) {
148+
freeaddrinfo(res);
149+
}
138150
return false;
139151
}
140152

141153
if (ca_certificate_pem != nullptr) {
142154
ret = tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
143155
ca_certificate_pem, strlen(ca_certificate_pem) + 1);
144156
if (ret != 0) {
145-
if (res) freeaddrinfo(res);
157+
if (res) {
158+
freeaddrinfo(res);
159+
}
146160
return false;
147161
}
148162
}
149163

150-
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
151-
if (raw_sock_fd < 0) {
152-
if (res) freeaddrinfo(res);
164+
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
165+
if (raw_sock_fd < 0) {
166+
if (res) {
167+
freeaddrinfo(res);
168+
}
153169
return false;
154-
}
170+
}
155171

156172
sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
157173

158174
if (setsockopt(*sock_fd, SOL_TLS, TLS_HOSTNAME, host, strlen(host)) ||
159175
setsockopt(*sock_fd, SOL_TLS, TLS_SEC_TAG_LIST, sec_tag_opt, sizeof(sec_tag_opt)) ||
160176
setsockopt(*sock_fd, SOL_SOCKET, SO_RCVTIMEO, &timeout_opt, sizeof(timeout_opt))) {
161-
if (res) freeaddrinfo(res);
177+
if (res) {
178+
freeaddrinfo(res);
179+
}
162180
return false;
163181
}
164182

165183
if (::connect(*sock_fd, res->ai_addr, res->ai_addrlen) < 0) {
166184
sock_fd.reset();
167-
if (res) freeaddrinfo(res);
185+
if (res) {
186+
freeaddrinfo(res);
187+
}
168188
return false;
169189
}
170190
is_ssl = true;
171191

172-
if (res) freeaddrinfo(res);
192+
if (res) {
193+
freeaddrinfo(res);
194+
}
173195
return true;
174196
}
175197
#endif
@@ -199,8 +221,10 @@ class ZephyrSocketWrapper {
199221
}
200222

201223
int recv(uint8_t *buffer, size_t size, int flags = MSG_DONTWAIT) {
202-
if (!sock_fd) return -1;
203-
224+
if (!sock_fd) {
225+
return -1;
226+
}
227+
204228
// TODO: see available()
205229
if (ssl_sock_temp_char != -1) {
206230
int ret = ::recv(*sock_fd, &buffer[1], size - 1, flags);
@@ -212,7 +236,9 @@ class ZephyrSocketWrapper {
212236
}
213237

214238
int send(const uint8_t *buffer, size_t size) {
215-
if (!sock_fd) return -1;
239+
if (!sock_fd) {
240+
return -1;
241+
}
216242
return ::send(*sock_fd, buffer, size, 0);
217243
}
218244

@@ -226,10 +252,12 @@ class ZephyrSocketWrapper {
226252
addr.sin_port = htons(port);
227253
addr.sin_addr.s_addr = INADDR_ANY;
228254

229-
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
230-
if (raw_sock_fd < 0) return false;
255+
int raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
256+
if (raw_sock_fd < 0) {
257+
return false;
258+
}
231259

232-
sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
260+
sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
233261

234262
zsock_ioctl(*sock_fd, ZFD_IOCTL_FIONBIO);
235263

@@ -242,7 +270,9 @@ class ZephyrSocketWrapper {
242270
}
243271

244272
bool listen(int backlog = 5) {
245-
if (!sock_fd) return false;
273+
if (!sock_fd) {
274+
return false;
275+
}
246276

247277
if (::listen(*sock_fd, backlog) < 0) {
248278
sock_fd.reset();
@@ -253,13 +283,17 @@ class ZephyrSocketWrapper {
253283
}
254284

255285
int accept() {
256-
if (!sock_fd) return false;
286+
if (!sock_fd) {
287+
return false;
288+
}
257289

258290
return ::accept(*sock_fd, nullptr, nullptr);
259291
}
260292

261293
String remoteIP() {
262-
if (!sock_fd) return {};
294+
if (!sock_fd) {
295+
return {};
296+
}
263297

264298
struct sockaddr_storage addr;
265299
socklen_t addr_len = sizeof(addr);

libraries/SocketWrapper/ZephyrClient.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {
4242
#endif
4343

4444
uint8_t connected() override {
45-
if (!sock_fd || *sock_fd == -1) return false;
45+
if (!sock_fd || *sock_fd == -1) {
46+
return false;
47+
}
4648

4749
uint8_t buf;
4850
int ret = ::recv(*sock_fd, &buf, 1, MSG_PEEK | MSG_DONTWAIT);

0 commit comments

Comments
 (0)