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

[core] use kThreadVersion1pX constants (#8562)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2022-12-21 11:36:38 -08:00
committed by GitHub
parent 052fccbed8
commit e167a1f071
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+1 -1
View File
@@ -3101,7 +3101,7 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo)
// Version
SuccessOrExit(error = Tlv::Find<VersionTlv>(aRxInfo.mMessage, version));
VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse);
VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse);
// Response
SuccessOrExit(error = aRxInfo.mMessage.ReadResponseTlv(response));
src/core/thread/mle_router.cpp
+4 -4
View File
@@ -634,7 +634,7 @@ void MleRouter::HandleLinkRequest(RxInfo &aRxInfo)
// Version
SuccessOrExit(error = Tlv::Find<VersionTlv>(aRxInfo.mMessage, version));
VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse);
VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse);
// Leader Data
switch (aRxInfo.mMessage.ReadLeaderDataTlv(leaderData))
@@ -888,7 +888,7 @@ Error MleRouter::HandleLinkAccept(RxInfo &aRxInfo, bool aRequest)
// Version
SuccessOrExit(error = Tlv::Find<VersionTlv>(aRxInfo.mMessage, version));
VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse);
VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse);
// Link and MLE Frame Counters
SuccessOrExit(error = aRxInfo.mMessage.ReadFrameCounterTlvs(linkFrameCounter, mleFrameCounter));
@@ -1600,7 +1600,7 @@ void MleRouter::HandleParentRequest(RxInfo &aRxInfo)
// Version
SuccessOrExit(error = Tlv::Find<VersionTlv>(aRxInfo.mMessage, version));
VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse);
VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse);
// Scan Mask
SuccessOrExit(error = Tlv::Find<ScanMaskTlv>(aRxInfo.mMessage, scanMask));
@@ -2241,7 +2241,7 @@ void MleRouter::HandleChildIdRequest(RxInfo &aRxInfo)
// Version
SuccessOrExit(error = Tlv::Find<VersionTlv>(aRxInfo.mMessage, version));
VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse);
VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse);
// Response
SuccessOrExit(error = aRxInfo.mMessage.ReadResponseTlv(response));
src/core/thread/topology.hpp
+1 -1
View File
@@ -584,7 +584,7 @@ public:
*/
bool IsEnhancedKeepAliveSupported(void) const
{
return mState != kStateInvalid && mVersion >= OT_THREAD_VERSION_1_2;
return (mState != kStateInvalid) && (mVersion >= kThreadVersion1p2);
}
/**