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

[ncp] reset iterator in get handler of OFF_MESH_ROUTES for local network data (#2161)

Browse Source 
This commit also simplifies the implementation for `ON_MESH_NETS`
get handler.
This commit is contained in:
Abtin Keshavarzian
2017-09-01 21:27:58 -07:00
committed by Jonathan Hui
parent b0cf1534bb
commit 2c8f50bb5b
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ncp/ncp_base_mtd.cpp
+9 -16
View File
@@ -1049,6 +1049,7 @@ otError NcpBase::GetPropertyHandler_THREAD_ON_MESH_NETS(uint8_t aHeader, spinel_
{
otError error = OT_ERROR_NONE;
otBorderRouterConfig borderRouterConfig;
otNetworkDataIterator iter = OT_NETWORK_DATA_ITERATOR_INIT;
uint8_t flags;
mDisableStreamWrite = true;
@@ -1063,15 +1064,8 @@ otError NcpBase::GetPropertyHandler_THREAD_ON_MESH_NETS(uint8_t aHeader, spinel_
));
// Fill from non-local network data first
for (otNetworkDataIterator iter = OT_NETWORK_DATA_ITERATOR_INIT ;;)
while (otNetDataGetNextOnMeshPrefix(mInstance, &iter, &borderRouterConfig) == OT_ERROR_NONE)
{
error = otNetDataGetNextOnMeshPrefix(mInstance, &iter, &borderRouterConfig);
if (error != OT_ERROR_NONE)
{
break;
}
flags = BorderRouterConfigToFlagByte(borderRouterConfig);
SuccessOrExit(
@@ -1094,16 +1088,12 @@ otError NcpBase::GetPropertyHandler_THREAD_ON_MESH_NETS(uint8_t aHeader, spinel_
}
#if OPENTHREAD_ENABLE_BORDER_ROUTER
iter = OT_NETWORK_DATA_ITERATOR_INIT;
// Fill from local network data last
for (otNetworkDataIterator iter = OT_NETWORK_DATA_ITERATOR_INIT ;;)
while (otBorderRouterGetNextOnMeshPrefix(mInstance, &iter, &borderRouterConfig) == OT_ERROR_NONE)
{
error = otBorderRouterGetNextOnMeshPrefix(mInstance, &iter, &borderRouterConfig);
if (error != OT_ERROR_NONE)
{
break;
}
flags = BorderRouterConfigToFlagByte(borderRouterConfig);
SuccessOrExit(
@@ -1839,6 +1829,9 @@ otError NcpBase::GetPropertyHandler_THREAD_OFF_MESH_ROUTES(uint8_t aHeader, spin
}
#if OPENTHREAD_ENABLE_BORDER_ROUTER
iter = OT_NETWORK_DATA_ITERATOR_INIT;
while (otBorderRouterGetNextRoute(mInstance, &iter, &external_route_config) == OT_ERROR_NONE)
{
SuccessOrExit(