commit d7749402f0c1d5b2ec296948fdfb2ad2520e836c
author Łukasz Maciejończyk <32327281+lmaciejonczyk@users.noreply.github.com> Thu Aug 19 21:17:09 2021 +0200
committer GitHub <noreply@github.com> Thu Aug 19 12:17:09 2021 -0700
tree 5dcca162bb1465cb9eee438f3c61242cd791c1fb
parent 9272666541c463a1e04e4ab51b0a813e590af1d0

[mac] append header termination IE2 when data payload is present (#6941)

MIC is a part of data payload, so if it's present, data payload is not
empty even if the data message is empty (ieee802154-2020 7.2.1 -
General MAC frame format).  If so according to Termination IE
inclusion rules (ieee802154-2020 7.4.2.1 Table 7-6) Header Termination
IE2 need to be applied.

src/core/thread/mesh_forwarder.cpp

diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp
index c77b05b..85de25a 100644
--- a/src/core/thread/mesh_forwarder.cpp
+++ b/src/core/thread/mesh_forwarder.cpp
@@ -1569,8 +1569,10 @@
 {
     uint8_t index     = 0;
     bool    iePresent = false;
-    bool    payloadPresent =
-        (aFrame.GetType() == Mac::Frame::kFcfFrameMacCmd) || (aMessage != nullptr && aMessage->GetLength() != 0);
+    // MIC is a part of Data Payload, so if it's present, Data Payload is not empty even if the message is
+    // MIC is always present when the frame is secured
+    bool payloadPresent = (aFrame.GetType() == Mac::Frame::kFcfFrameMacCmd) ||
+                          (aMessage != nullptr && aMessage->GetLength() != 0) || aFrame.GetSecurityEnabled();
 
 #if OPENTHREAD_CONFIG_TIME_SYNC_ENABLE
     if (aMessage != nullptr && aMessage->IsTimeSync())