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

Accept MLE messages that have MAC security enabled. (#311)

Browse Source
This commit is contained in:
Jonathan Hui
2016-08-01 09:35:51 -07:00
committed by GitHub
parent 2baff05f0d
commit 3e6f00d76b
1 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mle_router.cpp
+50 -30
View File
@@ -2132,25 +2132,35 @@ Neighbor *MleRouter::GetNeighbor(uint16_t aAddress)
ExitNow();
}
if (mDeviceState == kDeviceStateChild && (rval = Mle::GetNeighbor(aAddress)) != NULL)
switch (mDeviceState)
{
ExitNow();
}
case kDeviceStateDisabled:
break;
for (int i = 0; i < kMaxChildren; i++)
{
if (mChildren[i].mState == Neighbor::kStateValid && mChildren[i].mValid.mRloc16 == aAddress)
{
ExitNow(rval = &mChildren[i]);
}
}
case kDeviceStateDetached:
case kDeviceStateChild:
rval = Mle::GetNeighbor(aAddress);
break;
for (int i = 0; i < kMaxRouterId; i++)
{
if (mRouters[i].mState == Neighbor::kStateValid && mRouters[i].mValid.mRloc16 == aAddress)
case kDeviceStateRouter:
case kDeviceStateLeader:
for (int i = 0; i < kMaxChildren; i++)
{
ExitNow(rval = &mRouters[i]);
if (mChildren[i].mState == Neighbor::kStateValid && mChildren[i].mValid.mRloc16 == aAddress)
{
ExitNow(rval = &mChildren[i]);
}
}
for (int i = 0; i < kMaxRouterId; i++)
{
if (mRouters[i].mState == Neighbor::kStateValid && mRouters[i].mValid.mRloc16 == aAddress)
{
ExitNow(rval = &mRouters[i]);
}
}
break;
}
exit:
@@ -2161,27 +2171,37 @@ Neighbor *MleRouter::GetNeighbor(const Mac::ExtAddress &aAddress)
{
Neighbor *rval = NULL;
if (mDeviceState == kDeviceStateChild && (rval = Mle::GetNeighbor(aAddress)) != NULL)
switch (mDeviceState)
{
ExitNow();
}
case kDeviceStateDisabled:
break;
for (int i = 0; i < kMaxChildren; i++)
{
if (mChildren[i].mState == Neighbor::kStateValid &&
memcmp(&mChildren[i].mMacAddr, &aAddress, sizeof(mChildren[i].mMacAddr)) == 0)
{
ExitNow(rval = &mChildren[i]);
}
}
case kDeviceStateDetached:
case kDeviceStateChild:
rval = Mle::GetNeighbor(aAddress);
break;
for (int i = 0; i < kMaxRouterId; i++)
{
if (mRouters[i].mState == Neighbor::kStateValid &&
memcmp(&mRouters[i].mMacAddr, &aAddress, sizeof(mRouters[i].mMacAddr)) == 0)
case kDeviceStateRouter:
case kDeviceStateLeader:
for (int i = 0; i < kMaxChildren; i++)
{
ExitNow(rval = &mRouters[i]);
if (mChildren[i].mState == Neighbor::kStateValid &&
memcmp(&mChildren[i].mMacAddr, &aAddress, sizeof(mChildren[i].mMacAddr)) == 0)
{
ExitNow(rval = &mChildren[i]);
}
}
for (int i = 0; i < kMaxRouterId; i++)
{
if (mRouters[i].mState == Neighbor::kStateValid &&
memcmp(&mRouters[i].mMacAddr, &aAddress, sizeof(mRouters[i].mMacAddr)) == 0)
{
ExitNow(rval = &mRouters[i]);
}
}
break;
}
exit: