espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-18 16:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mac-frame] add mCommandId to TxFrame::Info (#10697)

Browse Source 
This commit updates `TxFrame::Info` to include `mCommandId`, used when
the frame type is `kTypeMacCmd`. This allows callers to specify the
Command ID when preparing a MAC Command `TxFrame`. With this change
`Frame::SetCommandId()` is no longer used or needed so it is
removed.
This commit is contained in:
Abtin Keshavarzian
2024-10-11 10:32:16 -07:00
committed by GitHub
parent 5673039686
commit af2e10a7bf
5 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/data_poll_sender.cpp
+1 -2
View File
@@ -567,6 +567,7 @@ Mac::TxFrame *DataPollSender::PrepareDataRequest(Mac::TxFrames &aTxFrames)
frameInfo.mPanIds.SetBothSourceDestination(Get<Mac::Mac>().GetPanId());
frameInfo.mType = Mac::Frame::kTypeMacCmd;
frameInfo.mCommandId = Mac::Frame::kMacCmdDataRequest;
frameInfo.mSecurityLevel = Mac::Frame::kSecurityEncMic32;
frameInfo.mKeyIdMode = Mac::Frame::kKeyIdMode1;
@@ -580,8 +581,6 @@ Mac::TxFrame *DataPollSender::PrepareDataRequest(Mac::TxFrames &aTxFrames)
}
#endif
IgnoreError(frame->SetCommandId(Mac::Frame::kMacCmdDataRequest));
exit:
return frame;
}
src/core/mac/mac.cpp
+3 -4
View File
@@ -729,13 +729,12 @@ TxFrame *Mac::PrepareBeaconRequest(void)
frameInfo.mAddrs.mDestination.SetShort(kShortAddrBroadcast);
frameInfo.mPanIds.SetDestination(kShortAddrBroadcast);
frameInfo.mType = Frame::kTypeMacCmd;
frameInfo.mVersion = Frame::kVersion2003;
frameInfo.mType = Frame::kTypeMacCmd;
frameInfo.mCommandId = Frame::kMacCmdBeaconRequest;
frameInfo.mVersion = Frame::kVersion2003;
frameInfo.PrepareHeadersIn(frame);
IgnoreError(frame.SetCommandId(Frame::kMacCmdBeaconRequest));
LogInfo("Sending Beacon Request");
return &frame;
src/core/mac/mac_frame.cpp
+1 -14
View File
@@ -238,7 +238,7 @@ void TxFrame::Info::PrepareHeadersIn(TxFrame &aTxFrame) const
if (mType == kTypeMacCmd)
{
builder.Append<uint8_t>(); // Placeholder for Command ID
IgnoreError(builder.AppendUint8(mCommandId));
}
builder.AppendLength(micSize + aTxFrame.GetFcsSize());
@@ -825,19 +825,6 @@ exit:
return error;
}
Error Frame::SetCommandId(uint8_t aCommandId)
{
Error error = kErrorNone;
uint8_t index = FindPayloadIndex();
VerifyOrExit(index != kInvalidIndex, error = kErrorParse);
mPsdu[IsVersion2015() ? index : (index - 1)] = aCommandId;
exit:
return error;
}
bool Frame::IsDataRequestCommand(void) const
{
bool isDataRequest = false;
src/core/mac/mac_frame.hpp
+1 -9
View File
@@ -481,15 +481,6 @@ public:
*/
Error GetCommandId(uint8_t &aCommandId) const;
/**
* Sets the Command ID.
*
* @param[in] aCommandId The Command ID.
*
* @retval kErrorNone Successfully set the Command ID.
*/
Error SetCommandId(uint8_t aCommandId);
/**
* Indicates whether the frame is a MAC Data Request command (data poll).
*
@@ -1065,6 +1056,7 @@ public:
PanIds mPanIds; ///< Source and destination PAN Ids.
SecurityLevel mSecurityLevel; ///< Frame security level.
KeyIdMode mKeyIdMode; ///< Frame security key ID mode.
CommandId mCommandId; ///< Command ID (applicable when `mType == kTypeMacCmd`).
bool mSuppressSequence : 1; ///< Whether to suppress seq number.
#if OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT
tests/unit/test_mac_frame.cpp
-6
View File
@@ -640,9 +640,6 @@ void TestMacFrameApi(void)
VerifyOrQuit(frame.GetType() == Mac::Frame::kTypeMacCmd);
SuccessOrQuit(frame.GetCommandId(commandId));
VerifyOrQuit(commandId == Mac::Frame::kMacCmdDataRequest);
SuccessOrQuit(frame.SetCommandId(Mac::Frame::kMacCmdBeaconRequest));
SuccessOrQuit(frame.GetCommandId(commandId));
VerifyOrQuit(commandId == Mac::Frame::kMacCmdBeaconRequest);
#if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)
// IEEE 802.15.4-2015 Mac Command
@@ -660,9 +657,6 @@ void TestMacFrameApi(void)
SuccessOrQuit(frame.GetCommandId(commandId));
VerifyOrQuit(commandId == Mac::Frame::kMacCmdDataRequest);
printf("commandId:%d\n", commandId);
SuccessOrQuit(frame.SetCommandId(Mac::Frame::kMacCmdOrphanNotification));
SuccessOrQuit(frame.GetCommandId(commandId));
VerifyOrQuit(commandId == Mac::Frame::kMacCmdOrphanNotification);
#endif
}