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

[slaac] set plen to 128 if prefix is not on-mesh (#5116)

Browse Source
This commit is contained in:
Jonathan Hui
2020-06-23 18:01:20 -07:00
parent 15c3463cec
commit 95a434d737
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/utils/slaac_address.cpp
+11 -7
View File
@@ -138,6 +138,14 @@ exit:
return;
}
bool Slaac::DoesConfigMatchNetifAddr(const NetworkData::OnMeshPrefixConfig &aConfig,
const Ip6::NetifUnicastAddress & aAddr)
{
return (((aConfig.mOnMesh && (aAddr.mPrefixLength == aConfig.mPrefix.mLength)) ||
(!aConfig.mOnMesh && (aAddr.mPrefixLength == 128))) &&
(aAddr.GetAddress().PrefixMatch(aConfig.mPrefix.mPrefix) >= aConfig.mPrefix.mLength));
}
void Slaac::Update(UpdateMode aMode)
{
NetworkData::Iterator iterator;
@@ -165,16 +173,13 @@ void Slaac::Update(UpdateMode aMode)
while (Get<NetworkData::Leader>().GetNextOnMeshPrefix(iterator, config) == OT_ERROR_NONE)
{
otIp6Prefix &prefix = config.mPrefix;
if (config.mDp)
{
// Skip domain prefix which is processed in MLE.
continue;
}
if (config.mSlaac && !ShouldFilter(prefix) && (prefix.mLength == slaacAddr->mPrefixLength) &&
(slaacAddr->GetAddress().PrefixMatch(prefix.mPrefix) >= prefix.mLength))
if (config.mSlaac && !ShouldFilter(config.mPrefix) && DoesConfigMatchNetifAddr(config, *slaacAddr))
{
found = true;
break;
@@ -212,8 +217,7 @@ void Slaac::Update(UpdateMode aMode)
for (const Ip6::NetifUnicastAddress *netifAddr = Get<ThreadNetif>().GetUnicastAddresses();
netifAddr != nullptr; netifAddr = netifAddr->GetNext())
{
if ((netifAddr->mPrefixLength == prefix.mLength) &&
(netifAddr->GetAddress().PrefixMatch(prefix.mPrefix) >= prefix.mLength))
if (DoesConfigMatchNetifAddr(config, *netifAddr))
{
found = true;
break;
@@ -234,7 +238,7 @@ void Slaac::Update(UpdateMode aMode)
slaacAddr->Clear();
memcpy(&slaacAddr->mAddress, &prefix.mPrefix, BitVectorBytes(prefix.mLength));
slaacAddr->mPrefixLength = prefix.mLength;
slaacAddr->mPrefixLength = config.mOnMesh ? prefix.mLength : 128;
slaacAddr->mAddressOrigin = OT_ADDRESS_ORIGIN_SLAAC;
slaacAddr->mPreferred = config.mPreferred;
slaacAddr->mValid = true;
src/core/utils/slaac_address.hpp
+3
View File
@@ -39,6 +39,7 @@
#include "common/locator.hpp"
#include "common/notifier.hpp"
#include "net/netif.hpp"
#include "thread/network_data.hpp"
namespace ot {
namespace Utils {
@@ -163,6 +164,8 @@ private:
void GetIidSecretKey(IidSecretKey &aKey) const;
static void HandleNotifierEvents(Notifier::Receiver &aReceiver, Events aEvents);
void HandleNotifierEvents(Events aEvents);
static bool DoesConfigMatchNetifAddr(const NetworkData::OnMeshPrefixConfig &aConfig,
const Ip6::NetifUnicastAddress & aAddr);
bool mEnabled;
otIp6SlaacPrefixFilter mFilter;