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

[mle] include Response TLV when sending Child Update Response (#4297)

Browse Source 
This commit always includes a Response TLV in a Child Update Response,
whenever the corresponding request includes a Challenge TLV.
This commit is contained in:
Jonathan Hui
2019-11-06 07:02:19 -08:00
parent ea564113ef
commit ec303c16a4
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+13 -8
View File
@@ -2249,6 +2249,14 @@ otError MleRouter::HandleChildUpdateRequest(const Message & aMessage,
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kMode, sizeof(mode), mode));
VerifyOrExit(mode.IsValid(), error = OT_ERROR_PARSE);
// Challenge
challenge.SetLength(0);
if (Tlv::GetTlv(aMessage, Tlv::kChallenge, sizeof(challenge), challenge) == OT_ERROR_NONE)
{
VerifyOrExit(challenge.IsValid(), error = OT_ERROR_PARSE);
tlvs[tlvslength++] = Tlv::kResponse;
}
// Find Child
aMessageInfo.GetPeerAddr().ToExtAddress(macAddr);
child = mChildTable.FindChild(macAddr, ChildTable::kInStateAnyExceptInvalid);
@@ -2263,7 +2271,7 @@ otError MleRouter::HandleChildUpdateRequest(const Message & aMessage,
if (mode.GetMode().IsRxOnWhenIdle())
{
tlvs[tlvslength++] = Tlv::kStatus;
SendChildUpdateResponse(NULL, aMessageInfo, tlvs, tlvslength, NULL);
SendChildUpdateResponse(NULL, aMessageInfo, tlvs, tlvslength, challenge);
}
ExitNow();
@@ -2277,11 +2285,8 @@ otError MleRouter::HandleChildUpdateRequest(const Message & aMessage,
// Parent MUST include Leader Data TLV in Child Update Response
tlvs[tlvslength++] = Tlv::kLeaderData;
// Challenge
if (Tlv::GetTlv(aMessage, Tlv::kChallenge, sizeof(challenge), challenge) == OT_ERROR_NONE)
if (challenge.IsValid())
{
VerifyOrExit(challenge.IsValid(), error = OT_ERROR_PARSE);
tlvs[tlvslength++] = Tlv::kResponse;
tlvs[tlvslength++] = Tlv::kMleFrameCounter;
tlvs[tlvslength++] = Tlv::kLinkFrameCounter;
}
@@ -2362,7 +2367,7 @@ otError MleRouter::HandleChildUpdateRequest(const Message & aMessage,
}
}
SendChildUpdateResponse(child, aMessageInfo, tlvs, tlvslength, &challenge);
SendChildUpdateResponse(child, aMessageInfo, tlvs, tlvslength, challenge);
exit:
return error;
@@ -2968,7 +2973,7 @@ void MleRouter::SendChildUpdateResponse(Child * aChild,
const Ip6::MessageInfo &aMessageInfo,
const uint8_t * aTlvs,
uint8_t aTlvsLength,
const ChallengeTlv * aChallenge)
const ChallengeTlv & aChallenge)
{
otError error = OT_ERROR_NONE;
Message *message;
@@ -3003,7 +3008,7 @@ void MleRouter::SendChildUpdateResponse(Child * aChild,
break;
case Tlv::kResponse:
SuccessOrExit(error = AppendResponse(*message, aChallenge->GetChallenge(), aChallenge->GetLength()));
SuccessOrExit(error = AppendResponse(*message, aChallenge.GetChallenge(), aChallenge.GetLength()));
break;
case Tlv::kSourceAddress:
src/core/thread/mle_router_ftd.hpp
+1 -1
View File
@@ -718,7 +718,7 @@ private:
const Ip6::MessageInfo &aMessageInfo,
const uint8_t * aTlvs,
uint8_t aTlvsLength,
const ChallengeTlv * aChallenge);
const ChallengeTlv & aChallenge);
otError SendDataResponse(const Ip6::Address &aDestination,
const uint8_t * aTlvs,
uint8_t aTlvsLength,