From 90bab8312baac13f6cf059fb2c4ef03a62f316dc Mon Sep 17 00:00:00 2001
From: rongli <rongli@nestlabs.com>
Date: Thu, 16 Mar 2017 01:35:16 +0800
Subject: [PATCH] Add payload dump for JOIN_FIN.rsp (#1470)

---
 src/core/meshcop/commissioner.cpp | 10 +++++++++-
 src/core/meshcop/joiner.cpp       |  7 ++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp
index fa1930094..2f7a79d1e 100644
--- a/src/core/meshcop/commissioner.cpp
+++ b/src/core/meshcop/commissioner.cpp
@@ -912,6 +912,14 @@ void Commissioner::SendJoinFinalizeResponse(const Coap::Header &aRequestHeader,
     joinerMessageInfo.SetPeerPort(mJoinerPort);
 
     mSendKek = true;
+#if OPENTHREAD_ENABLE_CERT_LOG
+    uint8_t buf[OPENTHREAD_CONFIG_MESSAGE_BUFFER_SIZE];
+    VerifyOrExit(message->GetLength() <= sizeof(buf), ;);
+    message->Read(responseHeader.GetLength(), message->GetLength() - responseHeader.GetLength(), buf);
+    otDumpCertMeshCoP("[THCI] direction=send | type=JOIN_FIN.rsp |", buf,
+                      message->GetLength() - responseHeader.GetLength());
+#endif
+
     SuccessOrExit(error = mNetif.GetSecureCoapServer().SendMessage(*message, joinerMessageInfo));
 
     memcpy(extAddr.m8, mJoinerIid, sizeof(extAddr.m8));
@@ -919,7 +927,7 @@ void Commissioner::SendJoinFinalizeResponse(const Coap::Header &aRequestHeader,
     RemoveJoiner(&extAddr);
 
     otLogInfoMeshCoP(GetInstance(), "sent joiner finalize response");
-    otLogCertMeshCoP(GetInstance(), "[THCI] direction=send | type=JOIN_FIN.rsp");
+
 exit:
 
     if (error != kThreadError_None && message != NULL)
diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp
index f426f145a..c02e890b1 100644
--- a/src/core/meshcop/joiner.cpp
+++ b/src/core/meshcop/joiner.cpp
@@ -361,7 +361,12 @@ void Joiner::HandleJoinerFinalizeResponse(Coap::Header *aHeader, Message *aMessa
     mTimer.Start(kTimeout);
 
     otLogInfoMeshCoP(GetInstance(), "received joiner finalize response %d", static_cast<uint8_t>(state.GetState()));
-    otLogCertMeshCoP(GetInstance(), "[THCI] direction=recv | type=JOIN_FIN.rsp");
+#if OPENTHREAD_ENABLE_CERT_LOG
+    uint8_t buf[OPENTHREAD_CONFIG_MESSAGE_BUFFER_SIZE];
+    VerifyOrExit(aMessage->GetLength() <= sizeof(buf), ;);
+    aMessage->Read(aHeader->GetLength(), aMessage->GetLength() - aHeader->GetLength(), buf);
+    otDumpCertMeshCoP("[THCI] direction=recv | type=JOIN_FIN.rsp |", buf, aMessage->GetLength() - aHeader->GetLength());
+#endif
 
 exit:
     Close();