From 3f711c132bb7cf1057c1efa0b5b6aa9250e9f31f Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Fri, 28 Feb 2025 13:46:37 -0800 Subject: [PATCH 1/2] unused onStreamStopped parameter --- secure_tunneling/source/SecureTunnel.cpp | 146 ++++++++++++++++++----- 1 file changed, 117 insertions(+), 29 deletions(-) diff --git a/secure_tunneling/source/SecureTunnel.cpp b/secure_tunneling/source/SecureTunnel.cpp index a189e0a0d..c5f02267d 100644 --- a/secure_tunneling/source/SecureTunnel.cpp +++ b/secure_tunneling/source/SecureTunnel.cpp @@ -164,11 +164,20 @@ namespace Aws return true; } - const Crt::Optional &Message::getPayload() const noexcept { return m_payload; } + const Crt::Optional &Message::getPayload() const noexcept + { + return m_payload; + } - const Crt::Optional &Message::getServiceId() const noexcept { return m_serviceId; } + const Crt::Optional &Message::getServiceId() const noexcept + { + return m_serviceId; + } - const uint32_t &Message::getConnectionId() const noexcept { return m_connectionId; } + const uint32_t &Message::getConnectionId() const noexcept + { + return m_connectionId; + } Message::~Message() { @@ -193,9 +202,15 @@ namespace Aws m_messageType = aws_byte_cursor_from_buf(&m_messageTypeStorage); } - const Crt::ByteCursor &SendMessageCompleteData::getMessageType() const noexcept { return m_messageType; } + const Crt::ByteCursor &SendMessageCompleteData::getMessageType() const noexcept + { + return m_messageType; + } - SendMessageCompleteData::~SendMessageCompleteData() { aws_byte_buf_clean_up(&m_messageTypeStorage); } + SendMessageCompleteData::~SendMessageCompleteData() + { + aws_byte_buf_clean_up(&m_messageTypeStorage); + } //*********************************************************************************************************************** /* ConnectionData */ @@ -215,9 +230,18 @@ namespace Aws setPacketByteBufOptional(m_serviceId3, m_serviceId3Storage, m_allocator, connection.service_id_3); } - const Crt::Optional &ConnectionData::getServiceId1() const noexcept { return m_serviceId1; } - const Crt::Optional &ConnectionData::getServiceId2() const noexcept { return m_serviceId2; } - const Crt::Optional &ConnectionData::getServiceId3() const noexcept { return m_serviceId3; } + const Crt::Optional &ConnectionData::getServiceId1() const noexcept + { + return m_serviceId1; + } + const Crt::Optional &ConnectionData::getServiceId2() const noexcept + { + return m_serviceId2; + } + const Crt::Optional &ConnectionData::getServiceId3() const noexcept + { + return m_serviceId3; + } ConnectionData::~ConnectionData() { @@ -241,11 +265,20 @@ namespace Aws m_connectionId = message.connection_id; } - const Crt::Optional &StreamStartedData::getServiceId() const noexcept { return m_serviceId; } + const Crt::Optional &StreamStartedData::getServiceId() const noexcept + { + return m_serviceId; + } - const uint32_t &StreamStartedData::getConnectionId() const noexcept { return m_connectionId; } + const uint32_t &StreamStartedData::getConnectionId() const noexcept + { + return m_connectionId; + } - StreamStartedData::~StreamStartedData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } + StreamStartedData::~StreamStartedData() + { + aws_byte_buf_clean_up(&m_serviceIdStorage); + } //*********************************************************************************************************************** /* StreamStoppedData */ @@ -261,9 +294,15 @@ namespace Aws setPacketByteBufOptional(m_serviceId, m_serviceIdStorage, m_allocator, message.service_id); } - const Crt::Optional &StreamStoppedData::getServiceId() const noexcept { return m_serviceId; } + const Crt::Optional &StreamStoppedData::getServiceId() const noexcept + { + return m_serviceId; + } - StreamStoppedData::~StreamStoppedData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } + StreamStoppedData::~StreamStoppedData() + { + aws_byte_buf_clean_up(&m_serviceIdStorage); + } //*********************************************************************************************************************** /* ConnectionStartedData */ @@ -285,9 +324,15 @@ namespace Aws return m_serviceId; } - const uint32_t &ConnectionStartedData::getConnectionId() const noexcept { return m_connectionId; } + const uint32_t &ConnectionStartedData::getConnectionId() const noexcept + { + return m_connectionId; + } - ConnectionStartedData::~ConnectionStartedData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } + ConnectionStartedData::~ConnectionStartedData() + { + aws_byte_buf_clean_up(&m_serviceIdStorage); + } //*********************************************************************************************************************** /* ConnectionResetData */ @@ -304,11 +349,20 @@ namespace Aws m_connectionId = message.connection_id; } - const Crt::Optional &ConnectionResetData::getServiceId() const noexcept { return m_serviceId; } + const Crt::Optional &ConnectionResetData::getServiceId() const noexcept + { + return m_serviceId; + } - const uint32_t &ConnectionResetData::getConnectionId() const noexcept { return m_connectionId; } + const uint32_t &ConnectionResetData::getConnectionId() const noexcept + { + return m_connectionId; + } - ConnectionResetData::~ConnectionResetData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } + ConnectionResetData::~ConnectionResetData() + { + aws_byte_buf_clean_up(&m_serviceIdStorage); + } //*********************************************************************************************************************** /* SecureTunnelBuilder */ @@ -558,6 +612,7 @@ namespace Aws m_OnDataReceive = std::move(onDataReceive); m_OnStreamStarted = std::move(onStreamStarted); m_OnStreamStart = std::move(onStreamStart); + m_OnStreamStopped = std::move(onStreamStopped); m_OnStreamReset = std::move(onStreamReset); m_OnConnectionStarted = std::move(onConnectionStarted); m_OnConnectionReset = std::move(onConnectionReset); @@ -785,7 +840,10 @@ namespace Aws return *this; } - bool SecureTunnel::IsValid() { return m_secure_tunnel ? true : false; } + bool SecureTunnel::IsValid() + { + return m_secure_tunnel ? true : false; + } int SecureTunnel::Start() { @@ -796,13 +854,22 @@ namespace Aws return aws_secure_tunnel_start(m_secure_tunnel); } - int SecureTunnel::Stop() { return aws_secure_tunnel_stop(m_secure_tunnel); } + int SecureTunnel::Stop() + { + return aws_secure_tunnel_stop(m_secure_tunnel); + } /* Deprecated - Use Start() */ - int SecureTunnel::Connect() { return Start(); } + int SecureTunnel::Connect() + { + return Start(); + } /* Deprecated - Use Stop() */ - int SecureTunnel::Close() { return Stop(); } + int SecureTunnel::Close() + { + return Stop(); + } /* Deprecated - Use SendMessage() */ int SecureTunnel::SendData(const Crt::ByteCursor &data) @@ -824,9 +891,18 @@ namespace Aws return aws_secure_tunnel_send_message(m_secure_tunnel, &message); } - int SecureTunnel::SendStreamStart() { return SendStreamStart(""); } - int SecureTunnel::SendStreamStart(std::string serviceId) { return SendStreamStart(serviceId, 0); } - int SecureTunnel::SendStreamStart(Crt::ByteCursor serviceId) { return SendStreamStart(serviceId, 0); } + int SecureTunnel::SendStreamStart() + { + return SendStreamStart(""); + } + int SecureTunnel::SendStreamStart(std::string serviceId) + { + return SendStreamStart(serviceId, 0); + } + int SecureTunnel::SendStreamStart(Crt::ByteCursor serviceId) + { + return SendStreamStart(serviceId, 0); + } int SecureTunnel::SendStreamStart(std::string serviceId, uint32_t connectionId) { struct aws_byte_cursor service_id_cur; @@ -850,7 +926,10 @@ namespace Aws return aws_secure_tunnel_stream_start(m_secure_tunnel, &messageView); } - int SecureTunnel::SendConnectionStart(uint32_t connectionId) { return SendConnectionStart("", connectionId); } + int SecureTunnel::SendConnectionStart(uint32_t connectionId) + { + return SendConnectionStart("", connectionId); + } int SecureTunnel::SendConnectionStart(std::string serviceId, uint32_t connectionId) { @@ -872,9 +951,15 @@ namespace Aws return aws_secure_tunnel_connection_start(m_secure_tunnel, &messageView); } - int SecureTunnel::SendStreamReset() { return aws_secure_tunnel_stream_reset(m_secure_tunnel, NULL); } + int SecureTunnel::SendStreamReset() + { + return aws_secure_tunnel_stream_reset(m_secure_tunnel, NULL); + } - aws_secure_tunnel *SecureTunnel::GetUnderlyingHandle() { return m_secure_tunnel; } + aws_secure_tunnel *SecureTunnel::GetUnderlyingHandle() + { + return m_secure_tunnel; + } void SecureTunnel::s_OnConnectionComplete( const struct aws_secure_tunnel_connection_view *connection, @@ -1096,6 +1181,9 @@ namespace Aws } } - void SecureTunnel::Shutdown() { Stop(); } + void SecureTunnel::Shutdown() + { + Stop(); + } } // namespace Iotsecuretunneling } // namespace Aws From d175a446cdd913e585edc994e9b992963280b5d1 Mon Sep 17 00:00:00 2001 From: Steve Kim Date: Fri, 28 Feb 2025 13:54:36 -0800 Subject: [PATCH 2/2] formatting --- secure_tunneling/source/SecureTunnel.cpp | 145 +++++------------------ 1 file changed, 29 insertions(+), 116 deletions(-) diff --git a/secure_tunneling/source/SecureTunnel.cpp b/secure_tunneling/source/SecureTunnel.cpp index c5f02267d..d2101bc94 100644 --- a/secure_tunneling/source/SecureTunnel.cpp +++ b/secure_tunneling/source/SecureTunnel.cpp @@ -164,20 +164,11 @@ namespace Aws return true; } - const Crt::Optional &Message::getPayload() const noexcept - { - return m_payload; - } + const Crt::Optional &Message::getPayload() const noexcept { return m_payload; } - const Crt::Optional &Message::getServiceId() const noexcept - { - return m_serviceId; - } + const Crt::Optional &Message::getServiceId() const noexcept { return m_serviceId; } - const uint32_t &Message::getConnectionId() const noexcept - { - return m_connectionId; - } + const uint32_t &Message::getConnectionId() const noexcept { return m_connectionId; } Message::~Message() { @@ -202,15 +193,9 @@ namespace Aws m_messageType = aws_byte_cursor_from_buf(&m_messageTypeStorage); } - const Crt::ByteCursor &SendMessageCompleteData::getMessageType() const noexcept - { - return m_messageType; - } + const Crt::ByteCursor &SendMessageCompleteData::getMessageType() const noexcept { return m_messageType; } - SendMessageCompleteData::~SendMessageCompleteData() - { - aws_byte_buf_clean_up(&m_messageTypeStorage); - } + SendMessageCompleteData::~SendMessageCompleteData() { aws_byte_buf_clean_up(&m_messageTypeStorage); } //*********************************************************************************************************************** /* ConnectionData */ @@ -230,18 +215,9 @@ namespace Aws setPacketByteBufOptional(m_serviceId3, m_serviceId3Storage, m_allocator, connection.service_id_3); } - const Crt::Optional &ConnectionData::getServiceId1() const noexcept - { - return m_serviceId1; - } - const Crt::Optional &ConnectionData::getServiceId2() const noexcept - { - return m_serviceId2; - } - const Crt::Optional &ConnectionData::getServiceId3() const noexcept - { - return m_serviceId3; - } + const Crt::Optional &ConnectionData::getServiceId1() const noexcept { return m_serviceId1; } + const Crt::Optional &ConnectionData::getServiceId2() const noexcept { return m_serviceId2; } + const Crt::Optional &ConnectionData::getServiceId3() const noexcept { return m_serviceId3; } ConnectionData::~ConnectionData() { @@ -265,20 +241,11 @@ namespace Aws m_connectionId = message.connection_id; } - const Crt::Optional &StreamStartedData::getServiceId() const noexcept - { - return m_serviceId; - } + const Crt::Optional &StreamStartedData::getServiceId() const noexcept { return m_serviceId; } - const uint32_t &StreamStartedData::getConnectionId() const noexcept - { - return m_connectionId; - } + const uint32_t &StreamStartedData::getConnectionId() const noexcept { return m_connectionId; } - StreamStartedData::~StreamStartedData() - { - aws_byte_buf_clean_up(&m_serviceIdStorage); - } + StreamStartedData::~StreamStartedData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } //*********************************************************************************************************************** /* StreamStoppedData */ @@ -294,15 +261,9 @@ namespace Aws setPacketByteBufOptional(m_serviceId, m_serviceIdStorage, m_allocator, message.service_id); } - const Crt::Optional &StreamStoppedData::getServiceId() const noexcept - { - return m_serviceId; - } + const Crt::Optional &StreamStoppedData::getServiceId() const noexcept { return m_serviceId; } - StreamStoppedData::~StreamStoppedData() - { - aws_byte_buf_clean_up(&m_serviceIdStorage); - } + StreamStoppedData::~StreamStoppedData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } //*********************************************************************************************************************** /* ConnectionStartedData */ @@ -324,15 +285,9 @@ namespace Aws return m_serviceId; } - const uint32_t &ConnectionStartedData::getConnectionId() const noexcept - { - return m_connectionId; - } + const uint32_t &ConnectionStartedData::getConnectionId() const noexcept { return m_connectionId; } - ConnectionStartedData::~ConnectionStartedData() - { - aws_byte_buf_clean_up(&m_serviceIdStorage); - } + ConnectionStartedData::~ConnectionStartedData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } //*********************************************************************************************************************** /* ConnectionResetData */ @@ -349,20 +304,11 @@ namespace Aws m_connectionId = message.connection_id; } - const Crt::Optional &ConnectionResetData::getServiceId() const noexcept - { - return m_serviceId; - } + const Crt::Optional &ConnectionResetData::getServiceId() const noexcept { return m_serviceId; } - const uint32_t &ConnectionResetData::getConnectionId() const noexcept - { - return m_connectionId; - } + const uint32_t &ConnectionResetData::getConnectionId() const noexcept { return m_connectionId; } - ConnectionResetData::~ConnectionResetData() - { - aws_byte_buf_clean_up(&m_serviceIdStorage); - } + ConnectionResetData::~ConnectionResetData() { aws_byte_buf_clean_up(&m_serviceIdStorage); } //*********************************************************************************************************************** /* SecureTunnelBuilder */ @@ -840,10 +786,7 @@ namespace Aws return *this; } - bool SecureTunnel::IsValid() - { - return m_secure_tunnel ? true : false; - } + bool SecureTunnel::IsValid() { return m_secure_tunnel ? true : false; } int SecureTunnel::Start() { @@ -854,22 +797,13 @@ namespace Aws return aws_secure_tunnel_start(m_secure_tunnel); } - int SecureTunnel::Stop() - { - return aws_secure_tunnel_stop(m_secure_tunnel); - } + int SecureTunnel::Stop() { return aws_secure_tunnel_stop(m_secure_tunnel); } /* Deprecated - Use Start() */ - int SecureTunnel::Connect() - { - return Start(); - } + int SecureTunnel::Connect() { return Start(); } /* Deprecated - Use Stop() */ - int SecureTunnel::Close() - { - return Stop(); - } + int SecureTunnel::Close() { return Stop(); } /* Deprecated - Use SendMessage() */ int SecureTunnel::SendData(const Crt::ByteCursor &data) @@ -891,18 +825,9 @@ namespace Aws return aws_secure_tunnel_send_message(m_secure_tunnel, &message); } - int SecureTunnel::SendStreamStart() - { - return SendStreamStart(""); - } - int SecureTunnel::SendStreamStart(std::string serviceId) - { - return SendStreamStart(serviceId, 0); - } - int SecureTunnel::SendStreamStart(Crt::ByteCursor serviceId) - { - return SendStreamStart(serviceId, 0); - } + int SecureTunnel::SendStreamStart() { return SendStreamStart(""); } + int SecureTunnel::SendStreamStart(std::string serviceId) { return SendStreamStart(serviceId, 0); } + int SecureTunnel::SendStreamStart(Crt::ByteCursor serviceId) { return SendStreamStart(serviceId, 0); } int SecureTunnel::SendStreamStart(std::string serviceId, uint32_t connectionId) { struct aws_byte_cursor service_id_cur; @@ -926,10 +851,7 @@ namespace Aws return aws_secure_tunnel_stream_start(m_secure_tunnel, &messageView); } - int SecureTunnel::SendConnectionStart(uint32_t connectionId) - { - return SendConnectionStart("", connectionId); - } + int SecureTunnel::SendConnectionStart(uint32_t connectionId) { return SendConnectionStart("", connectionId); } int SecureTunnel::SendConnectionStart(std::string serviceId, uint32_t connectionId) { @@ -951,15 +873,9 @@ namespace Aws return aws_secure_tunnel_connection_start(m_secure_tunnel, &messageView); } - int SecureTunnel::SendStreamReset() - { - return aws_secure_tunnel_stream_reset(m_secure_tunnel, NULL); - } + int SecureTunnel::SendStreamReset() { return aws_secure_tunnel_stream_reset(m_secure_tunnel, NULL); } - aws_secure_tunnel *SecureTunnel::GetUnderlyingHandle() - { - return m_secure_tunnel; - } + aws_secure_tunnel *SecureTunnel::GetUnderlyingHandle() { return m_secure_tunnel; } void SecureTunnel::s_OnConnectionComplete( const struct aws_secure_tunnel_connection_view *connection, @@ -1181,9 +1097,6 @@ namespace Aws } } - void SecureTunnel::Shutdown() - { - Stop(); - } + void SecureTunnel::Shutdown() { Stop(); } } // namespace Iotsecuretunneling } // namespace Aws