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

fix 3-handshakes link configuration issue (#110)

Browse Source 
fix wrong link margin value issue for response to link request
This commit is contained in:
rongli
2016-06-03 08:06:02 -07:00
committed by Jonathan Hui
parent b865607619
commit f8dedd8241
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+11 -4
View File
@@ -595,6 +595,7 @@ ThreadError MleRouter::HandleLinkRequest(const Message &aMessage, const Ip6::Mes
if (neighbor->mState != Neighbor::kStateValid)
{
memcpy(&neighbor->mMacAddr, &macAddr, sizeof(neighbor->mMacAddr));
neighbor->mRssi = reinterpret_cast<const ThreadMessageInfo *>(aMessageInfo.mLinkInfo)->mLinkMargin;
neighbor->mState = Neighbor::kStateLinkRequest;
}
else
@@ -629,6 +630,7 @@ ThreadError MleRouter::SendLinkAccept(const Ip6::MessageInfo &aMessageInfo, Neig
const TlvRequestTlv &aTlvRequest, const ChallengeTlv &aChallenge)
{
ThreadError error = kThreadError_None;
static const uint8_t routerTlvs[] = {Tlv::kLinkMargin};
Message *message;
Header::Command command;
int8_t linkMargin;
@@ -688,6 +690,7 @@ ThreadError MleRouter::SendLinkAccept(const Ip6::MessageInfo &aMessageInfo, Neig
SuccessOrExit(error = AppendChallenge(*message, aNeighbor->mPending.mChallenge,
sizeof(aNeighbor->mPending.mChallenge)));
SuccessOrExit(error = AppendTlvRequest(*message, routerTlvs, sizeof(routerTlvs)));
aNeighbor->mState = Neighbor::kStateLinkRequest;
}
@@ -835,8 +838,11 @@ ThreadError MleRouter::HandleLinkAccept(const Message &aMessage, const Ip6::Mess
break;
case kDeviceStateChild:
mRouters[routerId].mLinkQualityOut = 3;
mRouters[routerId].mLinkQualityIn = 3;
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kLinkMargin, sizeof(linkMargin), linkMargin));
VerifyOrExit(linkMargin.IsValid(), error = kThreadError_Parse);
mRouters[routerId].mLinkQualityOut = LinkMarginToQuality(linkMargin.GetLinkMargin());
mRouters[routerId].mLinkQualityIn = LinkMarginToQuality(reinterpret_cast<const ThreadMessageInfo *>
(aMessageInfo.mLinkInfo)->mLinkMargin);
break;
case kDeviceStateRouter:
@@ -849,8 +855,9 @@ ThreadError MleRouter::HandleLinkAccept(const Message &aMessage, const Ip6::Mess
// Link Margin
SuccessOrExit(error = Tlv::GetTlv(aMessage, Tlv::kLinkMargin, sizeof(linkMargin), linkMargin));
VerifyOrExit(linkMargin.IsValid(), error = kThreadError_Parse);
mRouters[routerId].mLinkQualityOut = 3;
mRouters[routerId].mLinkQualityIn = 3;
mRouters[routerId].mLinkQualityOut = LinkMarginToQuality(linkMargin.GetLinkMargin());
mRouters[routerId].mLinkQualityIn = LinkMarginToQuality(reinterpret_cast<const ThreadMessageInfo *>
(aMessageInfo.mLinkInfo)->mLinkMargin);
// update routing table
if (routerId != mRouterId && mRouters[routerId].mNextHop == kMaxRouterId)