From 474fc2669556a672b03038832ded0994efb79cce Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Thu, 6 Jul 2017 09:59:23 -0700
Subject: [PATCH] [supervision] Update logs to show when a supervision message
 is sent/received (#1960)

This commit updates the logs in supervision module to indicate when
a supervision message is sent to a sleepy child It also adds a new
log in `MeshForwarder::HandleReceivedFrame()` to indicate when an
empty payload frame is received.
---
 src/core/thread/mesh_forwarder.cpp   | 11 +++++++----
 src/core/utils/child_supervision.cpp |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp
index 518691731..c510b9e8f 100644
--- a/src/core/thread/mesh_forwarder.cpp
+++ b/src/core/thread/mesh_forwarder.cpp
@@ -1725,6 +1725,7 @@ void MeshForwarder::HandleReceivedFrame(Mac::Frame &aFrame)
     uint8_t payloadLength;
     uint8_t commandId;
     otError error = OT_ERROR_NONE;
+    char stringBuffer[Mac::Frame::kInfoStringSize];
 
     if (!mEnabled)
     {
@@ -1766,7 +1767,10 @@ void MeshForwarder::HandleReceivedFrame(Mac::Frame &aFrame)
         }
         else
         {
-            error = OT_ERROR_NOT_LOWPAN_DATA_FRAME;
+            VerifyOrExit(payloadLength == 0, error = OT_ERROR_NOT_LOWPAN_DATA_FRAME);
+
+            otLogInfoMac(GetInstance(), "Received empty payload frame, %s",
+                         aFrame.ToInfoString(stringBuffer, sizeof(stringBuffer)));
         }
 
         break;
@@ -1794,13 +1798,12 @@ exit:
 
     if (error != OT_ERROR_NONE)
     {
-        char stringBuffer[Mac::Frame::kInfoStringSize];
-
         otLogInfoMac(GetInstance(), "Dropping rx frame, error:%s, %s", otThreadErrorToString(error),
                      aFrame.ToInfoString(stringBuffer, sizeof(stringBuffer)));
 
-        OT_UNUSED_VARIABLE(stringBuffer);
     }
+
+    OT_UNUSED_VARIABLE(stringBuffer);
 }
 
 void MeshForwarder::HandleMesh(uint8_t *aFrame, uint8_t aFrameLength, const Mac::Address &aMacSource,
diff --git a/src/core/utils/child_supervision.cpp b/src/core/utils/child_supervision.cpp
index 62f88dccd..ed4806eb4 100644
--- a/src/core/utils/child_supervision.cpp
+++ b/src/core/utils/child_supervision.cpp
@@ -118,6 +118,8 @@ void ChildSupervisor::SendMessage(Child &aChild)
     SuccessOrExit(error = netif.SendMessage(*message));
     message = NULL;
 
+    otLogInfoMle(GetInstance(), "Sending supervision message to child 0x%04x", aChild.GetRloc16());
+
 exit:
 
     if (message != NULL)