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

allocate 6LoWPAN context ID for every prefix in the Valid Prefix Set (#366)

Browse Source
This commit is contained in:
rongli
2016-08-12 09:27:42 -07:00
committed by Jonathan Hui
parent 8f3279e3e0
commit 09ad8997d6
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_leader.cpp
+23 -29
View File
@@ -902,32 +902,24 @@ ThreadError Leader::AddBorderRouter(PrefixTlv &aPrefix, BorderRouterTlv &aBorder
dstPrefix->Init(aPrefix.GetDomainId(), aPrefix.GetPrefixLength(), aPrefix.GetPrefix());
}
if (aBorderRouter.IsStable())
if ((dstContext = FindContext(*dstPrefix)) != NULL)
{
dstPrefix->SetStable();
if ((dstContext = FindContext(*dstPrefix)) != NULL)
{
dstContext->SetCompress();
}
else if ((contextId = AllocateContext()) >= 0)
{
dstContext = reinterpret_cast<ContextTlv *>(dstPrefix->GetNext());
Insert(reinterpret_cast<uint8_t *>(dstContext), sizeof(ContextTlv));
dstPrefix->SetLength(dstPrefix->GetLength() + sizeof(ContextTlv));
dstContext->Init();
dstContext->SetStable();
dstContext->SetCompress();
dstContext->SetContextId(static_cast<uint8_t>(contextId));
dstContext->SetContextLength(aPrefix.GetPrefixLength());
}
else
{
ExitNow(error = kThreadError_NoBufs);
}
mContextLastUsed[dstContext->GetContextId() - kMinContextId] = 0;
dstContext->SetCompress();
}
else if ((contextId = AllocateContext()) >= 0)
{
dstContext = reinterpret_cast<ContextTlv *>(dstPrefix->GetNext());
Insert(reinterpret_cast<uint8_t *>(dstContext), sizeof(ContextTlv));
dstPrefix->SetLength(dstPrefix->GetLength() + sizeof(ContextTlv));
dstContext->Init();
dstContext->SetCompress();
dstContext->SetContextId(static_cast<uint8_t>(contextId));
dstContext->SetContextLength(aPrefix.GetPrefixLength());
}
VerifyOrExit(dstContext != NULL, error = kThreadError_NoBufs);
mContextLastUsed[dstContext->GetContextId() - kMinContextId] = 0;
if ((dstBorderRouter = FindBorderRouter(*dstPrefix, aBorderRouter.IsStable())) == NULL)
{
@@ -935,11 +927,6 @@ ThreadError Leader::AddBorderRouter(PrefixTlv &aPrefix, BorderRouterTlv &aBorder
Insert(reinterpret_cast<uint8_t *>(dstBorderRouter), sizeof(BorderRouterTlv));
dstPrefix->SetLength(dstPrefix->GetLength() + sizeof(BorderRouterTlv));
dstBorderRouter->Init();
if (aBorderRouter.IsStable())
{
dstBorderRouter->SetStable();
}
}
Insert(reinterpret_cast<uint8_t *>(dstBorderRouter->GetNext()), sizeof(BorderRouterEntry));
@@ -948,6 +935,13 @@ ThreadError Leader::AddBorderRouter(PrefixTlv &aPrefix, BorderRouterTlv &aBorder
memcpy(dstBorderRouter->GetEntry(dstBorderRouter->GetNumEntries() - 1), aBorderRouter.GetEntry(0),
sizeof(BorderRouterEntry));
if (aBorderRouter.IsStable())
{
dstPrefix->SetStable();
dstContext->SetStable();
dstBorderRouter->SetStable();
}
exit:
return error;
}