espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-01 06:49:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[spinel/ncp] update address cache table property to include additional info (#4599)

Browse Source 
This commit expands the `SPINEL_PROP_THREAD_ADDRESS_CACHE_TABLE`
property format to include more info about address cache table. This
change keeps the definition backward compatible by not changing
existing format and only adding new (optional) fields.
This commit is contained in:
Abtin Keshavarzian
2020-03-31 12:11:24 -07:00
committed by Jonathan Hui
parent 451a72f750
commit ee0dc4f9bb
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/spinel/spinel.h
+20 -1
View File
@@ -630,6 +630,14 @@ enum
SPINEL_MESHCOP_COMMISSIONER_STATE_ACTIVE = 2,
};
enum
{
SPINEL_ADDRESS_CACHE_ENTRY_STATE_CACHED = 0, // Entry is cached and in-use.
SPINEL_ADDRESS_CACHE_ENTRY_STATE_SNOOPED = 1, // Entry is created by snoop optimization.
SPINEL_ADDRESS_CACHE_ENTRY_STATE_QUERY = 2, // Entry represents an ongoing query for the EID.
SPINEL_ADDRESS_CACHE_ENTRY_STATE_RETRY_QUERY = 3, // Entry is in retry mode (a prior query did not a response).
};
typedef struct
{
uint8_t bytes[8];
@@ -2646,7 +2654,7 @@ enum
SPINEL_PROP_THREAD_NEIGHBOR_TABLE_ERROR_RATES = SPINEL_PROP_THREAD_EXT__BEGIN + 34,
/// EID (Endpoint Identifier) IPv6 Address Cache Table
/** Format `A(t(6SC))`
/** Format `A(t(6SCCt(bL6)t(bSS)))
*
* This property provides Thread EID address cache table.
*
@@ -2655,6 +2663,17 @@ enum
* `6` : Target IPv6 address
* `S` : RLOC16 of target
* `C` : Age (order of use, 0 indicates most recently used entry)
* `C` : Entry state (values are defined by enumeration `SPINEL_ADDRESS_CACHE_ENTRY_STATE_*`).
*
* `t` : Info when state is `SPINEL_ADDRESS_CACHE_ENTRY_STATE_CACHED`
* `b` : Indicates whether last transaction time and ML-EID are valid.
* `L` : Last transaction time
* `6` : Mesh-local EID
*
* `t` : Info when state is other than `SPINEL_ADDRESS_CACHE_ENTRY_STATE_CACHED`
* `b` : Indicates whether the entry can be evicted.
* `S` : Timeout in seconds
* `S` : Retry delay (applicable if in query-retry state).
*
*/
SPINEL_PROP_THREAD_ADDRESS_CACHE_TABLE = SPINEL_PROP_THREAD_EXT__BEGIN + 35,
src/ncp/ncp_base_ftd.cpp
+39
View File
@@ -925,6 +925,45 @@ template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_THREAD_ADDRESS_CACHE_
SuccessOrExit(error = mEncoder.WriteIp6Address(entry.mTarget));
SuccessOrExit(error = mEncoder.WriteUint16(entry.mRloc16));
SuccessOrExit(error = mEncoder.WriteUint8(index));
switch (entry.mState)
{
case OT_CACHE_ENTRY_STATE_CACHED:
SuccessOrExit(error = mEncoder.WriteUint8(SPINEL_ADDRESS_CACHE_ENTRY_STATE_CACHED));
break;
case OT_CACHE_ENTRY_STATE_SNOOPED:
SuccessOrExit(error = mEncoder.WriteUint8(SPINEL_ADDRESS_CACHE_ENTRY_STATE_SNOOPED));
break;
case OT_CACHE_ENTRY_STATE_QUERY:
SuccessOrExit(error = mEncoder.WriteUint8(SPINEL_ADDRESS_CACHE_ENTRY_STATE_QUERY));
break;
case OT_CACHE_ENTRY_STATE_RETRY_QUERY:
SuccessOrExit(error = mEncoder.WriteUint8(SPINEL_ADDRESS_CACHE_ENTRY_STATE_RETRY_QUERY));
break;
}
SuccessOrExit(error = mEncoder.OpenStruct());
if (entry.mState == OT_CACHE_ENTRY_STATE_CACHED)
{
SuccessOrExit(error = mEncoder.WriteBool(entry.mValidLastTrans));
SuccessOrExit(error = mEncoder.WriteUint32(entry.mLastTransTime));
SuccessOrExit(error = mEncoder.WriteIp6Address(entry.mMeshLocalEid));
}
SuccessOrExit(error = mEncoder.CloseStruct());
SuccessOrExit(error = mEncoder.OpenStruct());
if (entry.mState != OT_CACHE_ENTRY_STATE_CACHED)
{
SuccessOrExit(error = mEncoder.WriteBool(entry.mCanEvict));
SuccessOrExit(error = mEncoder.WriteUint16(entry.mTimeout));
SuccessOrExit(error = mEncoder.WriteUint16(entry.mRetryDelay));
}
SuccessOrExit(error = mEncoder.CloseStruct());
SuccessOrExit(error = mEncoder.CloseStruct());
}