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

Only handle Network Data TLV when Leader Data TLV is also included. (#1016)

Browse Source
This commit is contained in:
Jonathan Hui
2016-11-28 18:06:25 -08:00
committed by GitHub
parent 4c0cc27754
commit 76201e7610
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+9 -9
View File
@@ -2575,7 +2575,7 @@ ThreadError Mle::HandleChildUpdateRequest(const Message &aMessage, const Ip6::Me
ChallengeTlv challenge; ChallengeTlv challenge;
TlvRequestTlv tlvRequest; TlvRequestTlv tlvRequest;
uint8_t dataRequestTlvs[] = {Tlv::kNetworkData}; uint8_t dataRequestTlvs[] = {Tlv::kNetworkData};
uint8_t tlvs[kMaxResponseTlvs]; uint8_t tlvs[kMaxResponseTlvs] = {};
uint8_t numTlvs = 0; uint8_t numTlvs = 0;
otLogInfoMle("Received Child Update Request from parent"); otLogInfoMle("Received Child Update Request from parent");
@@ -2597,15 +2597,15 @@ ThreadError Mle::HandleChildUpdateRequest(const Message &aMessage, const Ip6::Me
{ {
mRetrieveNewNetworkData = true; mRetrieveNewNetworkData = true;
} }
}
// Network Data // Network Data
if (Tlv::GetTlv(aMessage, Tlv::kNetworkData, sizeof(networkData), networkData) == kThreadError_None) if (Tlv::GetTlv(aMessage, Tlv::kNetworkData, sizeof(networkData), networkData) == kThreadError_None)
{ {
VerifyOrExit(networkData.IsValid(), error = kThreadError_Parse); VerifyOrExit(networkData.IsValid(), error = kThreadError_Parse);
mNetworkData.SetNetworkData(leaderData.GetDataVersion(), leaderData.GetStableDataVersion(), mNetworkData.SetNetworkData(leaderData.GetDataVersion(), leaderData.GetStableDataVersion(),
(mDeviceMode & ModeTlv::kModeFullNetworkData) == 0, (mDeviceMode & ModeTlv::kModeFullNetworkData) == 0,
networkData.GetNetworkData(), networkData.GetLength()); networkData.GetNetworkData(), networkData.GetLength());
}
} }
// TLV Request // TLV Request