Skip to content

Commit 63160d8

Browse files
0xc01700xc0170
committed
netsocket: fix astyle coding style
1 parent 884a774 commit 63160d8

File tree

12 files changed

+216
-203
lines changed

12 files changed

+216
-203
lines changed

‎.astyleignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ features/storage/FEATURE_STORAGE
1010
features/frameworks
1111
features/FEATURE_BLE/targets
1212
features/unsupported/
13+
features/netsocket/emac-drivers
1314
hal/storage_abstraction
1415
features/nanostack/coap-service
1516
features/nanostack/sal-stack-nanostack

‎features/netsocket/SocketAddress.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class SocketAddress {
5757
}
5858

5959
/** Create a SocketAddress from a raw IP address and port
60-
*
60+
*
6161
* To construct from a host name, use NetworkInterface::gethostbyname
6262
*
6363
* @param addr Raw IP address

‎features/netsocket/TCPSocket.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TCPSocket::TCPSocket()
2222
{
2323
}
2424

25-
TCPSocket::TCPSocket(TCPSocket* parent, nsapi_socket_t socket, SocketAddress address)
25+
TCPSocket::TCPSocket(TCPSocket *parent, nsapi_socket_t socket, SocketAddress address)
2626
{
2727
_socket = socket,
2828
_stack = parent->_stack;

‎features/netsocket/TLSSocket.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,14 @@ class TLSSocket : public TLSSocketWrapper {
7070
* @param stack Network stack as target for socket
7171
* @return 0 on success, negative error code on failure
7272
*/
73-
virtual nsapi_error_t open(NetworkStack *stack) {
73+
virtual nsapi_error_t open(NetworkStack *stack)
74+
{
7475
return tcp_socket.open(stack);
7576
}
7677

7778
template <typename S>
78-
nsapi_error_t open(S *stack) {
79+
nsapi_error_t open(S *stack)
80+
{
7981
return open(nsapi_create_stack(stack));
8082
}
8183

‎features/netsocket/TLSSocketWrapper.cpp

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ TLSSocketWrapper::TLSSocketWrapper(Socket *transport, const char *hostname, cont
3333
_clicert(NULL),
3434
#endif
3535
_ssl_conf(NULL),
36-
_connect_transport(control==TRANSPORT_CONNECT || control==TRANSPORT_CONNECT_AND_CLOSE),
37-
_close_transport(control==TRANSPORT_CLOSE || control==TRANSPORT_CONNECT_AND_CLOSE),
36+
_connect_transport(control == TRANSPORT_CONNECT || control == TRANSPORT_CONNECT_AND_CLOSE),
37+
_close_transport(control == TRANSPORT_CLOSE || control == TRANSPORT_CONNECT_AND_CLOSE),
3838
_handshake_completed(false),
3939
_cacert_allocated(false),
4040
_clicert_allocated(false),
@@ -50,7 +50,8 @@ TLSSocketWrapper::TLSSocketWrapper(Socket *transport, const char *hostname, cont
5050
}
5151
}
5252

53-
TLSSocketWrapper::~TLSSocketWrapper() {
53+
TLSSocketWrapper::~TLSSocketWrapper()
54+
{
5455
if (_transport) {
5556
close();
5657
}
@@ -90,7 +91,7 @@ nsapi_error_t TLSSocketWrapper::set_root_ca_cert(const void *root_ca, size_t len
9091
/* Parse CA certification */
9192
int ret;
9293
if ((ret = mbedtls_x509_crt_parse(crt, static_cast<const unsigned char *>(root_ca),
93-
len)) != 0) {
94+
len)) != 0) {
9495
print_mbedtls_error("mbedtls_x509_crt_parse", ret);
9596
return NSAPI_ERROR_PARAMETER;
9697
}
@@ -111,7 +112,7 @@ nsapi_error_t TLSSocketWrapper::set_client_cert_key(const char *client_cert_pem,
111112
}
112113

113114
nsapi_error_t TLSSocketWrapper::set_client_cert_key(const void *client_cert, size_t client_cert_len,
114-
const void *client_private_key_pem, size_t client_private_key_len)
115+
const void *client_private_key_pem, size_t client_private_key_len)
115116
{
116117
#if !defined(MBEDTLS_X509_CRT_PARSE_C)
117118
return NSAPI_ERROR_UNSUPPORTED;
@@ -120,14 +121,14 @@ nsapi_error_t TLSSocketWrapper::set_client_cert_key(const void *client_cert, siz
120121
int ret;
121122
mbedtls_x509_crt *crt = new mbedtls_x509_crt;
122123
mbedtls_x509_crt_init(crt);
123-
if((ret = mbedtls_x509_crt_parse(crt, static_cast<const unsigned char *>(client_cert),
124-
client_cert_len)) != 0) {
124+
if ((ret = mbedtls_x509_crt_parse(crt, static_cast<const unsigned char *>(client_cert),
125+
client_cert_len)) != 0) {
125126
print_mbedtls_error("mbedtls_x509_crt_parse", ret);
126127
return NSAPI_ERROR_PARAMETER;
127128
}
128129
mbedtls_pk_init(&_pkctx);
129-
if((ret = mbedtls_pk_parse_key(&_pkctx, static_cast<const unsigned char *>(client_private_key_pem),
130-
client_private_key_len, NULL, 0)) != 0) {
130+
if ((ret = mbedtls_pk_parse_key(&_pkctx, static_cast<const unsigned char *>(client_private_key_pem),
131+
client_private_key_len, NULL, 0)) != 0) {
131132
print_mbedtls_error("mbedtls_pk_parse_key", ret);
132133
return NSAPI_ERROR_PARAMETER;
133134
}
@@ -139,7 +140,8 @@ nsapi_error_t TLSSocketWrapper::set_client_cert_key(const void *client_cert, siz
139140
}
140141

141142

142-
nsapi_error_t TLSSocketWrapper::do_handshake() {
143+
nsapi_error_t TLSSocketWrapper::do_handshake()
144+
{
143145
nsapi_error_t _error;
144146
const char DRBG_PERS[] = "mbed TLS client";
145147

@@ -153,8 +155,8 @@ nsapi_error_t TLSSocketWrapper::do_handshake() {
153155
*/
154156
int ret;
155157
if ((ret = mbedtls_ctr_drbg_seed(&_ctr_drbg, mbedtls_entropy_func, &_entropy,
156-
(const unsigned char *) DRBG_PERS,
157-
sizeof (DRBG_PERS))) != 0) {
158+
(const unsigned char *) DRBG_PERS,
159+
sizeof(DRBG_PERS))) != 0) {
158160
print_mbedtls_error("mbedtls_crt_drbg_init", ret);
159161
_error = ret;
160162
return _error;
@@ -177,7 +179,7 @@ nsapi_error_t TLSSocketWrapper::do_handshake() {
177179
return _error;
178180
}
179181

180-
mbedtls_ssl_set_bio(&_ssl, this, ssl_send, ssl_recv, NULL );
182+
mbedtls_ssl_set_bio(&_ssl, this, ssl_send, ssl_recv, NULL);
181183

182184
#ifdef MBEDTLS_X509_CRT_PARSE_C
183185
/* Start the handshake, the rest will be done in onReceive() */
@@ -189,7 +191,7 @@ nsapi_error_t TLSSocketWrapper::do_handshake() {
189191
do {
190192
ret = mbedtls_ssl_handshake(&_ssl);
191193
} while (ret != 0 && (ret == MBEDTLS_ERR_SSL_WANT_READ ||
192-
ret == MBEDTLS_ERR_SSL_WANT_WRITE));
194+
ret == MBEDTLS_ERR_SSL_WANT_WRITE));
193195
if (ret < 0) {
194196
print_mbedtls_error("mbedtls_ssl_handshake", ret);
195197
return ret;
@@ -205,13 +207,13 @@ nsapi_error_t TLSSocketWrapper::do_handshake() {
205207
#ifdef MBEDTLS_X509_CRT_PARSE_C
206208
/* Prints the server certificate and verify it. */
207209
const size_t buf_size = 1024;
208-
char* buf = new char[buf_size];
210+
char *buf = new char[buf_size];
209211
mbedtls_x509_crt_info(buf, buf_size, "\r ",
210-
mbedtls_ssl_get_peer_cert(&_ssl));
212+
mbedtls_ssl_get_peer_cert(&_ssl));
211213
tr_debug("Server certificate:\r\n%s\r\n", buf);
212214

213215
uint32_t flags = mbedtls_ssl_get_verify_result(&_ssl);
214-
if( flags != 0 ) {
216+
if (flags != 0) {
215217
/* Verification failed. */
216218
mbedtls_x509_crt_verify_info(buf, buf_size, "\r ! ", flags);
217219
tr_error("Certificate verification failed:\r\n%s", buf);
@@ -228,7 +230,8 @@ nsapi_error_t TLSSocketWrapper::do_handshake() {
228230
}
229231

230232

231-
nsapi_error_t TLSSocketWrapper::send(const void *data, nsapi_size_t size) {
233+
nsapi_error_t TLSSocketWrapper::send(const void *data, nsapi_size_t size)
234+
{
232235
int ret;
233236

234237
if (!_transport) {
@@ -239,7 +242,7 @@ nsapi_error_t TLSSocketWrapper::send(const void *data, nsapi_size_t size) {
239242
ret = mbedtls_ssl_write(&_ssl, (const unsigned char *) data, size);
240243

241244
if (ret == MBEDTLS_ERR_SSL_WANT_WRITE ||
242-
ret == MBEDTLS_ERR_SSL_WANT_READ) {
245+
ret == MBEDTLS_ERR_SSL_WANT_READ) {
243246
// translate to socket error
244247
return NSAPI_ERROR_WOULD_BLOCK;
245248
}
@@ -255,7 +258,8 @@ nsapi_size_or_error_t TLSSocketWrapper::sendto(const SocketAddress &, const void
255258
return send(data, size);
256259
}
257260

258-
nsapi_size_or_error_t TLSSocketWrapper::recv(void *data, nsapi_size_t size) {
261+
nsapi_size_or_error_t TLSSocketWrapper::recv(void *data, nsapi_size_t size)
262+
{
259263
int ret;
260264

261265
if (!_transport) {
@@ -265,7 +269,7 @@ nsapi_size_or_error_t TLSSocketWrapper::recv(void *data, nsapi_size_t size) {
265269
ret = mbedtls_ssl_read(&_ssl, (unsigned char *) data, size);
266270

267271
if (ret == MBEDTLS_ERR_SSL_WANT_WRITE ||
268-
ret == MBEDTLS_ERR_SSL_WANT_READ) {
272+
ret == MBEDTLS_ERR_SSL_WANT_READ) {
269273
// translate to socket error
270274
return NSAPI_ERROR_WOULD_BLOCK;
271275
} else if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
@@ -287,7 +291,8 @@ nsapi_size_or_error_t TLSSocketWrapper::recvfrom(SocketAddress *address, void *d
287291
return recv(data, size);
288292
}
289293

290-
void TLSSocketWrapper::print_mbedtls_error(const char *name, int err) {
294+
void TLSSocketWrapper::print_mbedtls_error(const char *name, int err)
295+
{
291296
#ifdef MBEDTLS_ERROR_C
292297
char *buf = new char[128];
293298
mbedtls_strerror(err, buf, 128);
@@ -303,14 +308,14 @@ void TLSSocketWrapper::print_mbedtls_error(const char *name, int err) {
303308
#if MBED_CONF_TLS_SOCKET_DEBUG_LEVEL > 0
304309

305310
void TLSSocketWrapper::my_debug(void *ctx, int level, const char *file, int line,
306-
const char *str)
311+
const char *str)
307312
{
308313
const char *p, *basename;
309314
(void) ctx;
310315

311316
/* Extract basename from file */
312-
for(p = basename = file; *p != '\0'; p++) {
313-
if(*p == '/' || *p == '\\') {
317+
for (p = basename = file; *p != '\0'; p++) {
318+
if (*p == '/' || *p == '\\') {
314319
basename = p + 1;
315320
}
316321
}
@@ -329,10 +334,9 @@ int TLSSocketWrapper::my_verify(void *data, mbedtls_x509_crt *crt, int depth, ui
329334
mbedtls_x509_crt_info(buf, buf_size - 1, " ", crt);
330335
tr_debug("%s", buf);
331336

332-
if (*flags == 0)
337+
if (*flags == 0) {
333338
tr_info("No verification issue for this certificate\n");
334-
else
335-
{
339+
} else {
336340
mbedtls_x509_crt_verify_info(buf, buf_size, " ! ", *flags);
337341
tr_info("%s\n", buf);
338342
}
@@ -345,7 +349,8 @@ int TLSSocketWrapper::my_verify(void *data, mbedtls_x509_crt *crt, int depth, ui
345349
#endif /* MBED_CONF_TLS_SOCKET_DEBUG_LEVEL > 0 */
346350

347351

348-
int TLSSocketWrapper::ssl_recv(void *ctx, unsigned char *buf, size_t len) {
352+
int TLSSocketWrapper::ssl_recv(void *ctx, unsigned char *buf, size_t len)
353+
{
349354
int recv;
350355

351356
TLSSocketWrapper *my = static_cast<TLSSocketWrapper *>(ctx);
@@ -358,14 +363,15 @@ int TLSSocketWrapper::ssl_recv(void *ctx, unsigned char *buf, size_t len) {
358363

359364
if (NSAPI_ERROR_WOULD_BLOCK == recv) {
360365
return MBEDTLS_ERR_SSL_WANT_READ;
361-
} else if(recv < 0) {
366+
} else if (recv < 0) {
362367
tr_error("Socket recv error %d", recv);
363368
}
364369
// Propagate also Socket errors to SSL, it allows negative error codes to be returned here.
365370
return recv;
366371
}
367372

368-
int TLSSocketWrapper::ssl_send(void *ctx, const unsigned char *buf, size_t len) {
373+
int TLSSocketWrapper::ssl_send(void *ctx, const unsigned char *buf, size_t len)
374+
{
369375
int size = -1;
370376
TLSSocketWrapper *my = static_cast<TLSSocketWrapper *>(ctx);
371377

@@ -377,12 +383,12 @@ int TLSSocketWrapper::ssl_send(void *ctx, const unsigned char *buf, size_t len)
377383

378384
if (NSAPI_ERROR_WOULD_BLOCK == size) {
379385
return MBEDTLS_ERR_SSL_WANT_WRITE;
380-
} else if(size < 0){
386+
} else if (size < 0) {
381387
tr_error("Socket send error %d", size);
382388
}
383389
// Propagate also Socket errors to SSL, it allows negative error codes to be returned here.
384390
return size;
385-
}
391+
}
386392

387393
#ifdef MBEDTLS_X509_CRT_PARSE_C
388394

@@ -401,7 +407,7 @@ int TLSSocketWrapper::set_own_cert(mbedtls_x509_crt *crt)
401407
}
402408
_clicert = crt;
403409
if (crt) {
404-
if((ret = mbedtls_ssl_conf_own_cert(get_ssl_config(), _clicert, &_pkctx)) != 0) {
410+
if ((ret = mbedtls_ssl_conf_own_cert(get_ssl_config(), _clicert, &_pkctx)) != 0) {
405411
print_mbedtls_error("mbedtls_ssl_conf_own_cert", ret);
406412
}
407413
}
@@ -437,12 +443,12 @@ mbedtls_ssl_config *TLSSocketWrapper::get_ssl_config()
437443

438444
tr_info("mbedtls_ssl_config_defaults()");
439445
if ((ret = mbedtls_ssl_config_defaults(_ssl_conf,
440-
MBEDTLS_SSL_IS_CLIENT,
441-
MBEDTLS_SSL_TRANSPORT_STREAM,
442-
MBEDTLS_SSL_PRESET_DEFAULT)) != 0) {
446+
MBEDTLS_SSL_IS_CLIENT,
447+
MBEDTLS_SSL_TRANSPORT_STREAM,
448+
MBEDTLS_SSL_PRESET_DEFAULT)) != 0) {
443449
print_mbedtls_error("mbedtls_ssl_config_defaults", ret);
444450
set_ssl_config(NULL);
445-
MBED_ERROR( MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_OUT_OF_MEMORY), "mbedtls_ssl_config_defaults() failed" );
451+
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_NETWORK_STACK, MBED_ERROR_CODE_OUT_OF_MEMORY), "mbedtls_ssl_config_defaults() failed");
446452
return NULL;
447453
}
448454
/* It is possible to disable authentication by passing

‎features/netsocket/TLSSocketWrapper.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class TLSSocketWrapper : public Socket {
123123
virtual nsapi_error_t connect(const SocketAddress &address = SocketAddress());
124124
virtual nsapi_size_or_error_t sendto(const SocketAddress &address, const void *data, nsapi_size_t size);
125125
virtual nsapi_size_or_error_t recvfrom(SocketAddress *address,
126-
void *data, nsapi_size_t size);
126+
void *data, nsapi_size_t size);
127127
virtual nsapi_error_t bind(const SocketAddress &address);
128128
virtual void set_blocking(bool blocking);
129129
virtual void set_timeout(int timeout);
@@ -190,7 +190,7 @@ class TLSSocketWrapper : public Socket {
190190
* Just prints on the USB serial port
191191
*/
192192
static void my_debug(void *ctx, int level, const char *file, int line,
193-
const char *str);
193+
const char *str);
194194

195195
/**
196196
* Certificate verification callback for mbed TLS
@@ -219,17 +219,17 @@ class TLSSocketWrapper : public Socket {
219219
Socket *_transport;
220220

221221
#ifdef MBEDTLS_X509_CRT_PARSE_C
222-
mbedtls_x509_crt* _cacert;
223-
mbedtls_x509_crt* _clicert;
222+
mbedtls_x509_crt *_cacert;
223+
mbedtls_x509_crt *_clicert;
224224
#endif
225-
mbedtls_ssl_config* _ssl_conf;
226-
227-
bool _connect_transport:1;
228-
bool _close_transport:1;
229-
bool _handshake_completed:1;
230-
bool _cacert_allocated:1;
231-
bool _clicert_allocated:1;
232-
bool _ssl_conf_allocated:1;
225+
mbedtls_ssl_config *_ssl_conf;
226+
227+
bool _connect_transport: 1;
228+
bool _close_transport: 1;
229+
bool _handshake_completed: 1;
230+
bool _cacert_allocated: 1;
231+
bool _clicert_allocated: 1;
232+
bool _ssl_conf_allocated: 1;
233233

234234
};
235235

‎features/netsocket/cellular/generic_modem_driver/OnboardCellularInterface.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
*/
3030

3131
OnboardCellularInterface::OnboardCellularInterface(bool debug) :
32-
UARTCellularInterface(MDMTXD, MDMRXD, MDMDCD, MDMRTS,
33-
MDMCTS, MDMRI, MDMDTR, MDMDSR,
34-
MBED_CONF_PPP_CELL_IFACE_BAUD_RATE, MDM_PIN_POLARITY, debug)
32+
UARTCellularInterface(MDMTXD, MDMRXD, MDMDCD, MDMRTS,
33+
MDMCTS, MDMRI, MDMDTR, MDMDSR,
34+
MBED_CONF_PPP_CELL_IFACE_BAUD_RATE, MDM_PIN_POLARITY, debug)
3535
{
3636
}
3737

0 commit comments

Comments
 (0)