espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-11-13 09:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mle] update how we set/get Parent Priority on ConnectivityTlv (#8878)

Browse Source 
This commit updates `ConnectivityTlv` methods which get/set the Parent
Priority field (high, medium, low). This change ensures that we do
not use bitwise shift of a signed and potentially negative value
(`a >> b` where `a` is negative). Note that the behavior of right
bitwise shift of a negative value is not specified by C++ standard
and it is implementation/toolchain dependent.
This commit is contained in:
Abtin Keshavarzian
2023-03-18 23:05:13 -07:00
committed by GitHub
parent 8ad7b2bd64
commit 922cf5ac98
2 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_tlvs.cpp
+37
View File
@@ -84,5 +84,42 @@ void ConnectivityTlv::IncrementLinkQuality(LinkQuality aLinkQuality)
}
}
int8_t ConnectivityTlv::GetParentPriority(void) const
{
int8_t priority = kParentPriorityUnspecified;
switch (mFlags & kFlagsParentPriorityMask)
{
case kFlagsPriorityHigh:
priority = kParentPriorityHigh;
break;
case kFlagsPriorityMedium:
priority = kParentPriorityMedium;
break;
case kFlagsPriorityLow:
priority = kParentPriorityLow;
default:
break;
}
return priority;
}
void ConnectivityTlv::SetParentPriority(int8_t aParentPriority)
{
if (aParentPriority > 0)
{
mFlags = kFlagsPriorityHigh;
}
else if (aParentPriority < 0)
{
mFlags = kFlagsPriorityLow;
}
else
{
mFlags = kFlagsPriorityMedium;
}
}
} // namespace Mle
} // namespace ot
src/core/thread/mle_tlvs.hpp
+9 -11
View File
@@ -776,10 +776,7 @@ public:
* @returns The Parent Priority value.
*
*/
int8_t GetParentPriority(void) const
{
return (static_cast<int8_t>(mParentPriority & kParentPriorityMask)) >> kParentPriorityOffset;
}
int8_t GetParentPriority(void) const;
/**
* This method sets the Parent Priority value.
@@ -787,10 +784,7 @@ public:
* @param[in] aParentPriority The Parent Priority value.
*
*/
void SetParentPriority(int8_t aParentPriority)
{
mParentPriority = (static_cast<uint8_t>(aParentPriority) << kParentPriorityOffset) & kParentPriorityMask;
}
void SetParentPriority(int8_t aParentPriority);
/**
* This method returns the Link Quality 3 value.
@@ -950,10 +944,14 @@ public:
void SetSedDatagramCount(uint8_t aSedDatagramCount) { mSedDatagramCount = aSedDatagramCount; }
private:
static constexpr uint8_t kParentPriorityOffset = 6;
static constexpr uint8_t kParentPriorityMask = 3 << kParentPriorityOffset;
static constexpr uint8_t kFlagsParentPriorityOffset = 6;
static constexpr uint8_t kFlagsParentPriorityMask = (3 << kFlagsParentPriorityOffset);
uint8_t mParentPriority;
static constexpr uint8_t kFlagsPriorityHigh = 1 << kFlagsParentPriorityOffset; // (01) 1
static constexpr uint8_t kFlagsPriorityMedium = 0 << kFlagsParentPriorityOffset; // (00) 0
static constexpr uint8_t kFlagsPriorityLow = 3 << kFlagsParentPriorityOffset; // (11) -1
uint8_t mFlags;
uint8_t mLinkQuality3;
uint8_t mLinkQuality2;
uint8_t mLinkQuality1;