espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-12 05:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mle] avoid shadow declaration with kVersion (#3294)

Browse Source 
Credit to OSS-Fuzz.
This commit is contained in:
Jonathan Hui
2018-11-13 15:17:03 -08:00
committed by GitHub
parent 0863b652b2
commit 1b1a1e7bc6
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
+2 -2
View File
@@ -527,7 +527,7 @@ otError Mle::Discover(uint32_t aScanChannels,
// Discovery Request TLV
discoveryRequest.Init();
discoveryRequest.SetVersion(kVersion);
discoveryRequest.SetVersion(kThreadVersion);
discoveryRequest.SetJoiner(aJoiner);
SuccessOrExit(error = message->Append(&discoveryRequest, sizeof(discoveryRequest)));
@@ -1304,7 +1304,7 @@ otError Mle::AppendVersion(Message &aMessage)
VersionTlv tlv;
tlv.Init();
tlv.SetVersion(kVersion);
tlv.SetVersion(kThreadVersion);
return aMessage.Append(&tlv, sizeof(tlv));
}
src/core/thread/mle_constants.hpp
+1 -1
View File
@@ -57,7 +57,7 @@ enum
*/
enum
{
kVersion = 2, ///< MLE Version
kThreadVersion = 2, ///< Thread Version
kUdpPort = 19788, ///< MLE UDP Port
kParentRequestRouterTimeout = 750, ///< Router Parent Request timeout
kParentRequestReedTimeout = 1250, ///< Router and REEDs Parent Request timeout
src/core/thread/mle_router.cpp
+3 -3
View File
@@ -600,7 +600,7 @@ otError MleRouter::HandleLinkRequest(const Message &aMessage, const Ip6::Message
// Version
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kVersion, sizeof(version), version));
VerifyOrExit(version.IsValid() && version.GetVersion() >= kVersion, error = OT_ERROR_PARSE);
VerifyOrExit(version.IsValid() && version.GetVersion() >= kThreadVersion, error = OT_ERROR_PARSE);
// Leader Data
if (Tlv::GetTlv(aMessage, Tlv::kLeaderData, sizeof(leaderData), leaderData) == OT_ERROR_NONE)
@@ -1609,7 +1609,7 @@ otError MleRouter::HandleParentRequest(const Message &aMessage, const Ip6::Messa
// Version
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kVersion, sizeof(version), version));
VerifyOrExit(version.IsValid() && version.GetVersion() >= kVersion, error = OT_ERROR_PARSE);
VerifyOrExit(version.IsValid() && version.GetVersion() >= kThreadVersion, error = OT_ERROR_PARSE);
// Scan Mask
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kScanMask, sizeof(scanMask), scanMask));
@@ -2733,7 +2733,7 @@ otError MleRouter::SendDiscoveryResponse(const Ip6::Address &aDestination, uint1
// Discovery Response TLV
discoveryResponse.Init();
discoveryResponse.SetVersion(kVersion);
discoveryResponse.SetVersion(kThreadVersion);
if (netif.GetKeyManager().GetSecurityPolicyFlags() & OT_SECURITY_POLICY_NATIVE_COMMISSIONING)
{