diff --git a/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp b/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp index 521d8aca56..00c250c268 100644 --- a/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp +++ b/UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp @@ -36,7 +36,7 @@ public: unsigned int dataSize = 10; char dataBuf[10]; protected: - UDPSocket* transport; + UDPSocket *transport; DTLSSocketWrapper *wrapper; NetworkStackstub stack; @@ -60,7 +60,7 @@ protected: delete wrapper; } - char* cert = "-----BEGIN CERTIFICATE-----\ + char *cert = "-----BEGIN CERTIFICATE-----\ MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\ MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\ DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\ @@ -304,10 +304,10 @@ TEST_F(TestDTLSSocketWrapper, recv_from_null) TEST_F(TestDTLSSocketWrapper, set_root_ca_cert) { - EXPECT_EQ(wrapper->get_ca_chain(), static_cast(NULL)); + EXPECT_EQ(wrapper->get_ca_chain(), static_cast(NULL)); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK); - EXPECT_NE(wrapper->get_ca_chain(), static_cast(NULL)); + EXPECT_NE(wrapper->get_ca_chain(), static_cast(NULL)); } TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_nolen) @@ -327,10 +327,10 @@ TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid) TEST_F(TestDTLSSocketWrapper, set_client_cert_key) { - EXPECT_EQ(wrapper->get_own_cert(), static_cast(NULL)); + EXPECT_EQ(wrapper->get_own_cert(), static_cast(NULL)); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK); - EXPECT_NE(wrapper->get_own_cert(), static_cast(NULL)); + EXPECT_NE(wrapper->get_own_cert(), static_cast(NULL)); } TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid) diff --git a/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp b/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp index 746171149e..98ff4b88fb 100644 --- a/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp +++ b/UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp @@ -36,7 +36,7 @@ public: unsigned int dataSize = 10; char dataBuf[10]; protected: - TCPSocket* transport; + TCPSocket *transport; TLSSocketWrapper *wrapper; NetworkStackstub stack; @@ -58,7 +58,7 @@ protected: delete wrapper; } - char* cert = "-----BEGIN CERTIFICATE-----\ + char *cert = "-----BEGIN CERTIFICATE-----\ MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\ MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\ DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\ @@ -319,10 +319,10 @@ TEST_F(TestTLSSocketWrapper, recv_from_null) TEST_F(TestTLSSocketWrapper, set_root_ca_cert) { - EXPECT_EQ(wrapper->get_ca_chain(), static_cast(NULL)); + EXPECT_EQ(wrapper->get_ca_chain(), static_cast(NULL)); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK); - EXPECT_NE(wrapper->get_ca_chain(), static_cast(NULL)); + EXPECT_NE(wrapper->get_ca_chain(), static_cast(NULL)); } TEST_F(TestTLSSocketWrapper, set_root_ca_cert_nolen) @@ -341,10 +341,10 @@ TEST_F(TestTLSSocketWrapper, set_root_ca_cert_invalid) TEST_F(TestTLSSocketWrapper, set_client_cert_key) { - EXPECT_EQ(wrapper->get_own_cert(), static_cast(NULL)); + EXPECT_EQ(wrapper->get_own_cert(), static_cast(NULL)); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK); - EXPECT_NE(wrapper->get_own_cert(), static_cast(NULL)); + EXPECT_NE(wrapper->get_own_cert(), static_cast(NULL)); } TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid) diff --git a/UNITTESTS/stubs/NetworkStack_stub.h b/UNITTESTS/stubs/NetworkStack_stub.h index 326bfa56aa..7612bd5efd 100644 --- a/UNITTESTS/stubs/NetworkStack_stub.h +++ b/UNITTESTS/stubs/NetworkStack_stub.h @@ -114,8 +114,7 @@ protected: virtual nsapi_size_or_error_t socket_recvfrom(nsapi_socket_t handle, SocketAddress *address, void *buffer, nsapi_size_t size) { - if (return_socketAddress != SocketAddress()) - { + if (return_socketAddress != SocketAddress()) { *address = return_socketAddress; } if (!return_values.empty()) { diff --git a/features/netsocket/DTLSSocket.cpp b/features/netsocket/DTLSSocket.cpp index cbe1b79763..5bb2f3d811 100644 --- a/features/netsocket/DTLSSocket.cpp +++ b/features/netsocket/DTLSSocket.cpp @@ -50,9 +50,8 @@ nsapi_error_t DTLSSocket::connect(const char *host, uint16_t port) DTLSSocket::~DTLSSocket() { - /* Make sure that DTLSSocketWrapper::close() is called before the transport is - * destroyed. - */ + // Make sure that DTLSSocketWrapper::close() is called before the transport is + // destroyed. close(); } diff --git a/features/netsocket/DTLSSocket.h b/features/netsocket/DTLSSocket.h index 2a57635806..871dea5760 100644 --- a/features/netsocket/DTLSSocket.h +++ b/features/netsocket/DTLSSocket.h @@ -62,12 +62,14 @@ public: * @param stack Network stack as target for socket * @return 0 on success, negative error code on failure */ - virtual nsapi_error_t open(NetworkStack *stack) { + virtual nsapi_error_t open(NetworkStack *stack) + { return _udp_socket.open(stack); } template - nsapi_error_t open(S *stack) { + nsapi_error_t open(S *stack) + { return open(nsapi_create_stack(stack)); } diff --git a/features/netsocket/DTLSSocketWrapper.cpp b/features/netsocket/DTLSSocketWrapper.cpp index 12dee0f811..7b393d704d 100644 --- a/features/netsocket/DTLSSocketWrapper.cpp +++ b/features/netsocket/DTLSSocketWrapper.cpp @@ -12,8 +12,8 @@ DTLSSocketWrapper::DTLSSocketWrapper(Socket *transport, const char *hostname, co _timer_event_id(0), _timer_expired(false) { - mbedtls_ssl_conf_transport( get_ssl_config(), MBEDTLS_SSL_TRANSPORT_DATAGRAM); - mbedtls_ssl_set_timer_cb( get_ssl_context(), this, timing_set_delay, timing_get_delay); + mbedtls_ssl_conf_transport(get_ssl_config(), MBEDTLS_SSL_TRANSPORT_DATAGRAM); + mbedtls_ssl_set_timer_cb(get_ssl_context(), this, timing_set_delay, timing_get_delay); } void DTLSSocketWrapper::timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms) diff --git a/features/netsocket/DTLSSocketWrapper.h b/features/netsocket/DTLSSocketWrapper.h index 88efd22d8c..aaa90e8ca7 100644 --- a/features/netsocket/DTLSSocketWrapper.h +++ b/features/netsocket/DTLSSocketWrapper.h @@ -15,7 +15,7 @@ private: void timer_event(); uint64_t _int_ms_tick; int _timer_event_id; - bool _timer_expired:1; + bool _timer_expired : 1; }; #endif diff --git a/features/netsocket/TLSSocketWrapper.cpp b/features/netsocket/TLSSocketWrapper.cpp index 001948381e..eb75479a84 100644 --- a/features/netsocket/TLSSocketWrapper.cpp +++ b/features/netsocket/TLSSocketWrapper.cpp @@ -160,7 +160,6 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call) } #ifdef MBEDTLS_X509_CRT_PARSE_C - /* Start the handshake, the rest will be done in onReceive() */ tr_info("Starting TLS handshake with %s", _ssl.hostname); #else tr_info("Starting TLS handshake"); @@ -198,7 +197,7 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call) ret = continue_handshake(); if (first_call) { - if (ret == NSAPI_ERROR_ALREADY ) { + if (ret == NSAPI_ERROR_ALREADY) { ret = NSAPI_ERROR_IN_PROGRESS; // If first call should return IN_PROGRESS } if (ret == NSAPI_ERROR_IS_CONNECTED) { @@ -208,7 +207,8 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call) return ret; } -nsapi_error_t TLSSocketWrapper::continue_handshake() { +nsapi_error_t TLSSocketWrapper::continue_handshake() +{ int ret; if (_handshake_completed) { @@ -623,13 +623,13 @@ nsapi_error_t TLSSocketWrapper::bind(const SocketAddress &address) void TLSSocketWrapper::set_blocking(bool blocking) { - set_timeout(blocking?-1:0); + set_timeout(blocking ? -1 : 0); } void TLSSocketWrapper::set_timeout(int timeout) { _timeout = timeout; - if (!is_handshake_started() && timeout!=-1 && _connect_transport) { + if (!is_handshake_started() && timeout != -1 && _connect_transport) { // If we have not yet connected the transport, we need to modify its blocking mode as well. // After connection is initiated, it is already set to non blocking mode _transport->set_timeout(timeout); @@ -641,7 +641,7 @@ void TLSSocketWrapper::sigio(mbed::Callback func) if (!_transport) { return; } - _sigio = func; + _sigio = func; _transport->sigio(mbed::callback(this, &TLSSocketWrapper::event)); } @@ -676,7 +676,7 @@ nsapi_error_t TLSSocketWrapper::listen(int) void TLSSocketWrapper::event() { - _event_flag.set(1); + _event_flag.set(1); if (_sigio) { _sigio(); }