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

[mle] become detached if no valid parent when sending "Child Update Request" (#2492)

Browse Source 
This commit changes the checks in `Mle::SendChildUpdateRequest()` so
that if there is no valid/restoring parent the device immediately
becomes detached and will go through full attach process.

This addresses an issue with an end-device failing to re-attach after
reset in case the device can restore its network info from
settings/flash but there is no parent info entry in the settings.
This commit is contained in:
Abtin Keshavarzian
2018-01-19 17:04:35 +00:00
committed by Jonathan Hui
parent bb9e6003f7
commit afcb345219
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle.cpp
+23 -3
View File
@@ -337,8 +337,23 @@ otError Mle::Restore(void)
if (!IsActiveRouter(networkInfo.mRloc16))
{
length = sizeof(parentInfo);
SuccessOrExit(error = otPlatSettingsGet(&netif.GetInstance(), Settings::kKeyParentInfo, 0,
reinterpret_cast<uint8_t *>(&parentInfo), &length));
error = otPlatSettingsGet(&netif.GetInstance(), Settings::kKeyParentInfo, 0,
reinterpret_cast<uint8_t *>(&parentInfo), &length);
if (error != OT_ERROR_NONE)
{
// If the restored RLOC16 corresponds to an end-device, it
// is expected that the `ParentInfo` settings to be valid
// as well. The device can still recover from such an invalid
// setting by skipping the re-attach ("Child Update Request"
// exchange) and going through the full attach process.
otLogWarnMle(GetInstance(), "Invalid settings - no saved parent info with valid end-device RLOC16 0x%04x",
networkInfo.mRloc16);
ExitNow();
}
VerifyOrExit(length >= sizeof(parentInfo), error = OT_ERROR_PARSE);
memset(&mParent, 0, sizeof(mParent));
@@ -1811,7 +1826,12 @@ otError Mle::SendChildUpdateRequest(void)
ExitNow();
}
VerifyOrExit(mParent.IsStateValidOrRestoring(), error = OT_ERROR_INVALID_STATE);
if (!mParent.IsStateValidOrRestoring())
{
otLogWarnMle(GetInstance(), "No valid parent when sending Child Update Request");
BecomeDetached();
ExitNow();
}
mChildUpdateRequestTimer.Start(kUnicastRetransmissionDelay);
mChildUpdateAttempts++;