Put echo protocol implementation under namespace 'Echo' to align with…

… other protocols (#4455)
project-chip · Jan 26, 2021 · 2097bcc · 2097bcc
1 parent 12aea86
commit 2097bcc
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/src/messaging/tests/TestReliableMessageProtocol.cpp b/src/messaging/tests/TestReliableMessageProtocol.cpp
@@ -207,7 +207,7 @@ void CheckResendMessage(nlTestSuite * inSuite, void * inContext)
 
     gSendMessageCount = 0;
 
-    err = exchange->SendMessage(kProtocol_Echo, kEchoMessageType_EchoRequest, std::move(buffer),
+    err = exchange->SendMessage(kProtocol_Echo, Echo::kEchoMessageType_EchoRequest, std::move(buffer),
                                 Messaging::SendFlags(Messaging::SendMessageFlags::kNone));
     NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
 

diff --git a/src/messaging/tests/echo/echo_requester.cpp b/src/messaging/tests/echo/echo_requester.cpp
@@ -50,7 +50,7 @@ constexpr size_t kMaxEchoCount = 3;
 constexpr int32_t gEchoInterval = 1000;
 
 // The EchoClient object.
-chip::Protocols::EchoClient gEchoClient;
+chip::Protocols::Echo::EchoClient gEchoClient;
 
 chip::TransportMgr<chip::Transport::UDP> gUDPManager;
 chip::TransportMgr<chip::Transport::TCP<kMaxTcpActiveConnectionCount, kMaxTcpPendingPackets>> gTCPManager;

diff --git a/src/messaging/tests/echo/echo_responder.cpp b/src/messaging/tests/echo/echo_responder.cpp
@@ -42,7 +42,7 @@
 namespace {
 
 // The EchoServer object.
-chip::Protocols::EchoServer gEchoServer;
+chip::Protocols::Echo::EchoServer gEchoServer;
 chip::TransportMgr<chip::Transport::UDP> gUDPManager;
 chip::TransportMgr<chip::Transport::TCP<kMaxTcpActiveConnectionCount, kMaxTcpPendingPackets>> gTCPManager;
 chip::SecureSessionMgr gSessionManager;

diff --git a/src/protocols/echo/Echo.h b/src/protocols/echo/Echo.h
@@ -36,6 +36,7 @@
 
 namespace chip {
 namespace Protocols {
+namespace Echo {
 
 enum
 {
@@ -145,5 +146,6 @@ class DLL_EXPORT EchoServer : public Messaging::ExchangeDelegate
     void OnResponseTimeout(Messaging::ExchangeContext * ec) override {}
 };
 
+} // namespace Echo
 } // namespace Protocols
 } // namespace chip
diff --git a/src/protocols/echo/EchoClient.cpp b/src/protocols/echo/EchoClient.cpp
@@ -27,6 +27,7 @@
 
 namespace chip {
 namespace Protocols {
+namespace Echo {
 
 CHIP_ERROR EchoClient::Init(Messaging::ExchangeManager * exchangeMgr, SecureSessionHandle session)
 {
@@ -120,5 +121,6 @@ void EchoClient::OnResponseTimeout(Messaging::ExchangeContext * ec)
     ChipLogProgress(Echo, "Time out! failed to receive echo response from Exchange: %p", ec);
 }
 
+} // namespace Echo
 } // namespace Protocols
 } // namespace chip
diff --git a/src/protocols/echo/EchoServer.cpp b/src/protocols/echo/EchoServer.cpp
@@ -27,6 +27,7 @@
 
 namespace chip {
 namespace Protocols {
+namespace Echo {
 
 CHIP_ERROR EchoServer::Init(Messaging::ExchangeManager * exchangeMgr)
 {
@@ -85,5 +86,6 @@ void EchoServer::OnMessageReceived(Messaging::ExchangeContext * ec, const Packet
     ec->Close();
 }
 
+} // namespace Echo
 } // namespace Protocols
 } // namespace chip
diff --git a/src/transport/tests/TestSecureSessionMgr.cpp b/src/transport/tests/TestSecureSessionMgr.cpp
@@ -251,7 +251,7 @@ void SendEncryptedPacketTest(nlTestSuite * inSuite, void * inContext)
     payloadHeader.SetProtocolID(chip::Protocols::kProtocol_Echo);
 
     // Set the message type for this header.
-    payloadHeader.SetMessageType(chip::Protocols::kEchoMessageType_EchoRequest);
+    payloadHeader.SetMessageType(chip::Protocols::Echo::kEchoMessageType_EchoRequest);
 
     payloadHeader.SetInitiator(true);
 
@@ -320,10 +320,10 @@ void SendBadEncryptedPacketTest(nlTestSuite * inSuite, void * inContext)
     payloadHeader.SetExchangeID(0);
 
     // Set the protocol ID for this header.
-    payloadHeader.SetProtocolID(chip::Protocols::kProtocol_Echo);
+    payloadHeader.SetProtocolID(Protocols::kProtocol_Echo);
 
     // Set the message type for this header.
-    payloadHeader.SetMessageType(chip::Protocols::kEchoMessageType_EchoRequest);
+    payloadHeader.SetMessageType(Protocols::Echo::kEchoMessageType_EchoRequest);
 
     payloadHeader.SetInitiator(true);