Remove extra build constructs and update against the latest system AP…

…I changes

BUILD.gn

@@ -64,6 +64,8 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     if (chip_build_tools) {
       deps += [
         "${chip_root}/examples/shell/standalone:chip-shell",
+        "${chip_root}/src/messaging/tests/echo:chip-echo-requester",
+        "${chip_root}/src/messaging/tests/echo:chip-echo-responder",            
         "${chip_root}/src/qrcodetool",
         "${chip_root}/src/setup_payload",
       ]

src/messaging/tests/echo/README.md

@@ -22,9 +22,8 @@ transport (TCP, UDP, or CRMP).
 ## Building
 
 ```
-cd echo
-git submodule update --init
-source third_party/connectedhomeip/scripts/activate.sh
+source scripts/activate.sh
+cd src/messaging/tests/echo
 gn gen out/debug
 ninja -C out/debug
 ```

src/messaging/tests/echo/common.cpp

@@ -28,7 +28,7 @@
 #include <support/ErrorStr.h>
 
 // The ExchangeManager global object.
-ExchangeManager gExchangeManager;
+Messaging::ExchangeManager gExchangeManager;
 
 void InitializeChip(void)
 {

src/messaging/tests/echo/common.h

@@ -42,7 +42,7 @@ using namespace chip;
 constexpr chip::NodeId kClientDeviceId = 12344321;
 constexpr chip::NodeId kServerDeviceId = 12344322;
 
-extern ExchangeManager gExchangeManager;
+extern Messaging::ExchangeManager gExchangeManager;
 
 void InitializeChip(void);
 void ShutdownChip(void);

src/messaging/tests/echo/echo_requester.cpp

@@ -77,49 +77,31 @@ bool EchoIntervalExpired(void)
     return (Now() >= gLastEchoTime + gEchoInterval);
 }
 
-System::PacketBuffer * FormulateEchoRequestBuffer()
+CHIP_ERROR SendEchoRequest(void)
 {
-    System::PacketBufferHandle buffer = System::PacketBuffer::New();
+    CHIP_ERROR err                        = CHIP_NO_ERROR;
+    System::PacketBufferHandle payloadBuf = System::PacketBuffer::New();
 
-    if (buffer.IsNull())
+    if (payloadBuf.IsNull())
     {
         printf("Unable to allocate PacketBuffer\n");
-        return nullptr;
+        return CHIP_ERROR_NO_MEMORY;
     }
     else
     {
         // Add some application payload data in the buffer.
-        char * p    = reinterpret_cast<char *>(buffer->Start());
+        char * p    = reinterpret_cast<char *>(payloadBuf->Start());
         int32_t len = snprintf(p, CHIP_SYSTEM_CONFIG_HEADER_RESERVE_SIZE, "Echo Message %" PRIu64 "\n", gEchoCount);
 
         // Set the datalength in the buffer appropriately.
-        buffer->SetDataLength((uint16_t) len);
-
-        return buffer.Release_ForNow();
+        payloadBuf->SetDataLength((uint16_t) len);
     }
-}
-
-CHIP_ERROR SendEchoRequest(void)
-{
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
-    System::PacketBuffer * payloadBuf = NULL;
 
     gLastEchoTime = Now();
 
-    payloadBuf = FormulateEchoRequestBuffer();
-    if (payloadBuf == NULL)
-    {
-        return CHIP_ERROR_NO_MEMORY;
-    }
-
     printf("\nSend echo request message to Node: %lu\n", kServerDeviceId);
 
-    err = gEchoClient.SendEchoRequest(kServerDeviceId, payloadBuf);
-
-    // Set the local buffer to NULL after passing it down to
-    // the lower layers who are now responsible for freeing
-    // the buffer.
-    payloadBuf = NULL;
+    err = gEchoClient.SendEchoRequest(kServerDeviceId, std::move(payloadBuf));
 
     if (err == CHIP_NO_ERROR)
     {
@@ -161,7 +143,7 @@ CHIP_ERROR EstablishSecureSession()
     return err;
 }
 
-void HandleEchoResponseReceived(NodeId nodeId, System::PacketBuffer * payload)
+void HandleEchoResponseReceived(NodeId nodeId, System::PacketBufferHandle payload)
 {
     uint32_t respTime    = Now();
     uint32_t transitTime = respTime - gLastEchoTime;

src/messaging/tests/echo/echo_responder.cpp

@@ -41,7 +41,7 @@ SecureSessionMgr gSessionManager;
 SecurePairingUsingTestSecret gTestPairing;
 
 // Callback handler when a CHIP EchoRequest is received.
-void HandleEchoRequestReceived(NodeId nodeId, System::PacketBuffer * payload)
+void HandleEchoRequestReceived(NodeId nodeId, System::PacketBufferHandle payload)
 {
     printf("Echo Request from node %lu, len=%u ... sending response.\n", nodeId, payload->DataLength());
 }