commit 45480ccbb2fd5aa471d0bd85133983955e8f1f79
author Buke Po <bukepo@gmail.com> Sun Feb 12 09:16:58 2017 -0600
committer Jonathan Hui <jonhui@nestlabs.com> Sun Feb 12 07:16:58 2017 -0800
tree 6181b54e5f715ed0b1ca7affbd6d2d3901867c5a
parent 11c1b4982d3dc2a310b633879417adf8a4c99ef5

temporaily fix zero-length payload with payload marker (#1300)

src/core/thread/network_diagnostic.cpp

diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp
index c6c3a9c..67bf920 100644
--- a/src/core/thread/network_diagnostic.cpp
+++ b/src/core/thread/network_diagnostic.cpp
@@ -511,16 +511,18 @@
     VerifyOrExit((message = mNetif.GetCoapServer().NewMessage(0)) != NULL, error = kThreadError_NoBufs);
 
     header.SetDefaultResponseHeader(aHeader);
-
-    if (networkDiagnosticTlv.GetLength() > 0)
-    {
-        header.SetPayloadMarker();
-    }
+    header.SetPayloadMarker();
 
     SuccessOrExit(error = message->Append(header.GetBytes(), header.GetLength()));
 
     SuccessOrExit(error = FillRequestedTlvs(aMessage, *message, networkDiagnosticTlv));
 
+    if (message->GetLength() == header.GetLength())
+    {
+        // Remove Payload Marker if payload is actually empty.
+        message->SetLength(header.GetLength() - 1);
+    }
+
     SuccessOrExit(error = mNetif.GetCoapServer().SendMessage(*message, messageInfo));
 
     otLogInfoNetDiag("Sent diagnostic get response");