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

[mle] process Active and Pending Timestamps in MLE Child Update Request (#2131)

Browse Source 
This commit adds proper handling of Active and Pending Timestamp TLVs
that are included in parent-initiated MLE Child Update Requests.
This commit is contained in:
Jonathan Hui
2017-08-24 14:03:26 -07:00
committed by GitHub
parent 1e3f3d1830
commit f29de59077
1 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+14 -36
View File
@@ -2361,7 +2361,6 @@ otError Mle::HandleLeaderData(const Message &aMessage, const Ip6::MessageInfo &a
uint16_t pendingDatasetOffset = 0;
bool dataRequest = false;
Tlv tlv;
uint16_t delay;
// Leader Data
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kLeaderData, sizeof(leaderData), leaderData));
@@ -2479,13 +2478,22 @@ otError Mle::HandleLeaderData(const Message &aMessage, const Ip6::MessageInfo &a
exit:
OT_UNUSED_VARIABLE(aMessageInfo);
if (dataRequest)
{
static const uint8_t tlvs[] = {Tlv::kNetworkData};
uint16_t delay;
delay = aMessageInfo.GetSockAddr().IsMulticast() ? (otPlatRandomGet() % kMleMaxResponseDelay) : 0;
if (aMessageInfo.GetSockAddr().IsMulticast())
{
delay = otPlatRandomGet() % kMleMaxResponseDelay;
}
else
{
// This method may have been called from an MLE request
// handler. We add a minimum delay here so that the MLE
// response is enqueued before the MLE Data Request.
delay = 10;
}
SendDataRequest(aMessageInfo.GetPeerAddr(), tlvs, sizeof(tlvs), delay);
}
@@ -2809,14 +2817,12 @@ otError Mle::HandleChildUpdateRequest(const Message &aMessage, const Ip6::Messag
{
static const uint8_t kMaxResponseTlvs = 5;
ThreadNetif &netif = GetNetif();
otError error = OT_ERROR_NONE;
SourceAddressTlv sourceAddress;
LeaderDataTlv leaderData;
NetworkDataTlv networkData;
ChallengeTlv challenge;
TlvRequestTlv tlvRequest;
uint8_t dataRequestTlvs[] = {Tlv::kNetworkData};
uint8_t tlvs[kMaxResponseTlvs] = {};
uint8_t numTlvs = 0;
@@ -2827,31 +2833,8 @@ otError Mle::HandleChildUpdateRequest(const Message &aMessage, const Ip6::Messag
VerifyOrExit(sourceAddress.IsValid(), error = OT_ERROR_PARSE);
VerifyOrExit(mParent.GetRloc16() == sourceAddress.GetRloc16(), error = OT_ERROR_DROP);
// Leader Data
if (Tlv::GetTlv(aMessage, Tlv::kLeaderData, sizeof(leaderData), leaderData) == OT_ERROR_NONE)
{
VerifyOrExit(leaderData.IsValid(), error = OT_ERROR_PARSE);
SetLeaderData(leaderData.GetPartitionId(), leaderData.GetWeighting(), leaderData.GetLeaderRouterId());
if ((mDeviceMode & ModeTlv::kModeFullNetworkData &&
leaderData.GetDataVersion() != netif.GetNetworkDataLeader().GetVersion()) ||
((mDeviceMode & ModeTlv::kModeFullNetworkData) == 0 &&
leaderData.GetStableDataVersion() != netif.GetNetworkDataLeader().GetStableVersion()))
{
mRetrieveNewNetworkData = true;
}
// Network Data
if (Tlv::GetTlv(aMessage, Tlv::kNetworkData, sizeof(networkData), networkData) == OT_ERROR_NONE)
{
VerifyOrExit(networkData.IsValid(), error = OT_ERROR_PARSE);
netif.GetNetworkDataLeader().SetNetworkData(leaderData.GetDataVersion(),
leaderData.GetStableDataVersion(),
(mDeviceMode & ModeTlv::kModeFullNetworkData) == 0,
networkData.GetNetworkData(),
networkData.GetLength());
}
}
// Leader Data, Network Data, Active Timestamp, Pending Timestamp
SuccessOrExit(error = HandleLeaderData(aMessage, aMessageInfo));
// TLV Request
if (Tlv::GetTlv(aMessage, Tlv::kTlvRequest, sizeof(tlvRequest), tlvRequest) == OT_ERROR_NONE)
@@ -2873,11 +2856,6 @@ otError Mle::HandleChildUpdateRequest(const Message &aMessage, const Ip6::Messag
SuccessOrExit(error = SendChildUpdateResponse(tlvs, numTlvs, challenge));
if (mRetrieveNewNetworkData)
{
SendDataRequest(aMessageInfo.GetPeerAddr(), dataRequestTlvs, sizeof(dataRequestTlvs), 0);
}
exit:
return error;
}