espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-10-09 17:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cli: update 'keysequence' to make keyswithguardtime configurable (#815)

Browse Source 
* Cli: update 'keysequence' to make keyswithguardtime configurable
This commit is contained in:
rongli
2016-10-16 22:49:31 -07:00
committed by Jonathan Hui
parent 8468ffdb77
commit aaf5a57ea2
25 changed files with 289 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/draft-spinel-protocol.html
+20 -5
View File
@@ -451,8 +451,9 @@
<link href="#rfc.section.5.6.5" rel="Chapter" title="5.6.5 PROP 68: PROP_NET_NETWORK_NAME"/>
<link href="#rfc.section.5.6.6" rel="Chapter" title="5.6.6 PROP 69: PROP_NET_XPANID"/>
<link href="#rfc.section.5.6.7" rel="Chapter" title="5.6.7 PROP 70: PROP_NET_MASTER_KEY"/>
<link href="#rfc.section.5.6.8" rel="Chapter" title="5.6.8 PROP 71: PROP_NET_KEY_SEQUENCE"/>
<link href="#rfc.section.5.6.8" rel="Chapter" title="5.6.8 PROP 71: PROP_NET_KEY_SEQUENCE_COUNTER"/>
<link href="#rfc.section.5.6.9" rel="Chapter" title="5.6.9 PROP 72: PROP_NET_PARTITION_ID"/>
<link href="#rfc.section.5.6.10" rel="Chapter" title="5.6.10 PROP 73: PROP_NET_KEY_SWITCH_GUARDTIME"/>
<link href="#rfc.section.5.7" rel="Chapter" title="5.7 IPv6 Properties"/>
<link href="#rfc.section.5.7.1" rel="Chapter" title="5.7.1 PROP 96: PROP_IPV6_LL_ADDR"/>
<link href="#rfc.section.5.7.2" rel="Chapter" title="5.7.2 PROP 97: PROP_IPV6_ML_ADDR"/>
@@ -689,8 +690,9 @@
<li>5.6.5. <a href="#rfc.section.5.6.5">PROP 68: PROP_NET_NETWORK_NAME</a></li>
<li>5.6.6. <a href="#rfc.section.5.6.6">PROP 69: PROP_NET_XPANID</a></li>
<li>5.6.7. <a href="#rfc.section.5.6.7">PROP 70: PROP_NET_MASTER_KEY</a></li>
<li>5.6.8. <a href="#rfc.section.5.6.8">PROP 71: PROP_NET_KEY_SEQUENCE</a></li>
<li>5.6.8. <a href="#rfc.section.5.6.8">PROP 71: PROP_NET_KEY_SEQUENCE_COUNTER</a></li>
<li>5.6.9. <a href="#rfc.section.5.6.9">PROP 72: PROP_NET_PARTITION_ID</a></li>
<li>5.6.10. <a href="#rfc.section.5.6.10">PROP 73: PROP_NET_KEY_SWITCH_GUARDTIME</a></li>
</ul><li>5.7. <a href="#rfc.section.5.7">IPv6 Properties</a></li>
<ul><li>5.7.1. <a href="#rfc.section.5.7.1">PROP 96: PROP_IPV6_LL_ADDR</a></li>
<li>5.7.2. <a href="#rfc.section.5.7.2">PROP 97: PROP_IPV6_ML_ADDR</a></li>
@@ -2456,7 +2458,7 @@ STACK-NAME/STACK-VERSION[BUILD_INFO][; OTHER_INFO]; BUILD_DATE_AND_TIME
</ul>
<p> </p>
<h1 id="rfc.section.5.6.8"><a href="#rfc.section.5.6.8">5.6.8.</a> <a href="#prop-net-key-sequence" id="prop-net-key-sequence">PROP 71: PROP_NET_KEY_SEQUENCE</a></h1>
<h1 id="rfc.section.5.6.8"><a href="#rfc.section.5.6.8">5.6.8.</a> <a href="#prop-net-key-sequence-counter" id="prop-net-key-sequence-counter">PROP 71: PROP_NET_KEY_SEQUENCE_COUNTER</a></h1>
<p/>
<ul>
@@ -2475,6 +2477,17 @@ STACK-NAME/STACK-VERSION[BUILD_INFO][; OTHER_INFO]; BUILD_DATE_AND_TIME
<p> </p>
<p id="rfc.section.5.6.9.p.2">The partition ID of the partition that this node is a member of. </p>
<p> </p>
<h1 id="rfc.section.5.6.10"><a href="#rfc.section.5.6.10">5.6.10.</a> <a href="#prop-net-key-switch-guardtime" id="prop-net-key-switch-guardtime">PROP 73: PROP_NET_KEY_SWITCH_GUARDTIME</a></h1>
<p/>
<ul>
<li>Type: Read-Write</li>
<li>Packed-Encoding: <samp>L</samp></li>
</ul>
<h1 id="rfc.section.5.7"><a href="#rfc.section.5.7">5.7.</a> <a href="#prop-ipv6" id="prop-ipv6">IPv6 Properties</a></h1>
<h1 id="rfc.section.5.7.1"><a href="#rfc.section.5.7.1">5.7.1.</a> <a href="#prop-ipv6-ll-addr" id="prop-ipv6-ll-addr">PROP 96: PROP_IPV6_LL_ADDR</a></h1>
<p/>
@@ -3596,8 +3609,10 @@ FE
<li>CMD_VALUE_IS:PROP_NET_NETWORK_NAME</li>
<li>CMD_VALUE_SET:PROP_NET_MASTER_KEY</li>
<li>CMD_VALUE_IS:PROP_NET_MASTER_KEY</li>
<li>CMD_VALUE_SET:PROP_NET_KEY_SEQUENCE</li>
<li>CMD_VALUE_IS:PROP_NET_KEY_SEQUENCE</li>
<li>CMD_VALUE_SET:PROP_NET_KEY_SEQUENCE_COUNTER</li>
<li>CMD_VALUE_IS:PROP_NET_KEY_SEQUENCE_COUNTER</li>
<li>CMD_VALUE_SET:PROP_NET_KEY_SWITCH_GUARDTIME</li>
<li>CMD_VALUE_IS:PROP_NET_KEY_SWITCH_GUARDTIME</li>
</ul>
<p> </p>
doc/draft-spinel-protocol.txt
+12 -4
View File
@@ -152,8 +152,9 @@ Quattlebaum Expires April 14, 2017 [Page 2]
5.6.5. PROP 68: PROP_NET_NETWORK_NAME . . . . . . . . . . . 35
5.6.6. PROP 69: PROP_NET_XPANID . . . . . . . . . . . . . . 35
5.6.7. PROP 70: PROP_NET_MASTER_KEY . . . . . . . . . . . . 35
5.6.8. PROP 71: PROP_NET_KEY_SEQUENCE . . . . . . . . . . . 35
5.6.8. PROP 71: PROP_NET_KEY_SEQUENCE_COUNTER. . . . . . . . 35
5.6.9. PROP 72: PROP_NET_PARTITION_ID . . . . . . . . . . . 35
5.6.10. PROP 73: PROP_NET_KEY_SWITCH_GUARDTIME . . . . . . . 35
5.7. IPv6 Properties . . . . . . . . . . . . . . . . . . . . . 35
5.7.1. PROP 96: PROP_IPV6_LL_ADDR . . . . . . . . . . . . . 35
5.7.2. PROP 97: PROP_IPV6_ML_ADDR . . . . . . . . . . . . . 36
@@ -1934,7 +1935,7 @@ Quattlebaum Expires April 14, 2017 [Page 34]
o Type: Read-Write
o Packed-Encoding: "D"
5.6.8. PROP 71: PROP_NET_KEY_SEQUENCE
5.6.8. PROP 71: PROP_NET_KEY_SEQUENCE_COUNTER
o Type: Read-Write
o Packed-Encoding: "L"
@@ -1946,6 +1947,11 @@ Quattlebaum Expires April 14, 2017 [Page 34]
The partition ID of the partition that this node is a member of.
5.6.10. PROP 73: PROP_NET_KEY_SWITCH_GUARDTIME
o Type: Read-Write
o Packed-Encoding: "L"
5.7. IPv6 Properties
5.7.1. PROP 96: PROP_IPV6_LL_ADDR
@@ -3103,8 +3109,10 @@ F.2. Attaching to a network
o CMD_VALUE_IS:PROP_NET_NETWORK_NAME
o CMD_VALUE_SET:PROP_NET_MASTER_KEY
o CMD_VALUE_IS:PROP_NET_MASTER_KEY
o CMD_VALUE_SET:PROP_NET_KEY_SEQUENCE
o CMD_VALUE_IS:PROP_NET_KEY_SEQUENCE
o CMD_VALUE_SET:PROP_NET_KEY_SEQUENCE_COUNTER
o CMD_VALUE_IS:PROP_NET_KEY_SEQUENCE_COUNTER
o CMD_VALUE_SET:PROP_NET_KEY_SWITCH_GUARDTIME
o CMD_VALUE_IS:PROP_NET_KEY_SWITCH_GUARDTIME
Bring the network interface up:
doc/spinel-protocol-src/spinel-example-sessions.md
+5 -2
View File
@@ -59,8 +59,11 @@ Set the network properties, if they were not already set:
* CMD_VALUE_SET:PROP_NET_MASTER_KEY
* CMD_VALUE_IS:PROP_NET_MASTER_KEY
* CMD_VALUE_SET:PROP_NET_KEY_SEQUENCE
* CMD_VALUE_IS:PROP_NET_KEY_SEQUENCE
* CMD_VALUE_SET:PROP_NET_KEY_SEQUENCE_COUNTER
* CMD_VALUE_IS:PROP_NET_KEY_SEQUENCE_COUNTER
* CMD_VALUE_SET:PROP_NET_KEY_SWITCH_GUARDTIME
* CMD_VALUE_IS:PROP_NET_KEY_SWITCH_GUARDTIME
Bring the network interface up:
doc/spinel-protocol-src/spinel-prop-net.md
+4 -1
View File
@@ -46,7 +46,7 @@ Values:
* Type: Read-Write
* Packed-Encoding: `D`
### PROP 71: PROP_NET_KEY_SEQUENCE {#prop-net-key-sequence}
### PROP 71: PROP_NET_KEY_SEQUENCE_COUNTER {#prop-net-key-sequence-counter}
* Type: Read-Write
* Packed-Encoding: `L`
@@ -56,5 +56,8 @@ Values:
The partition ID of the partition that this node is a member of.
### PROP 73: PROP_NET_KEY_SWITCH_GUARDTIME {#prop-net-key-swtich-guardtime}
* Type: Read-Write
* Packed-Encoding: `L`
include/openthread-types.h
+1 -1
View File
@@ -514,7 +514,7 @@ enum
OT_NET_ROLE = 1 << 3, ///< Device role (disabled, detached, child, router, leader) changed
OT_NET_PARTITION_ID = 1 << 4, ///< Partition ID changed
OT_NET_KEY_SEQUENCE = 1 << 5, ///< Thread Key Sequence changed
OT_NET_KEY_SEQUENCE_COUNTER = 1 << 5, ///< Thread Key Sequence changed
OT_THREAD_CHILD_ADDED = 1 << 6, ///< Child was added
OT_THREAD_CHILD_REMOVED = 1 << 7, ///< Child was removed
include/openthread.h
+22
View File
@@ -1283,6 +1283,28 @@ uint32_t otGetKeySequenceCounter(otInstance *aInstance);
*/
void otSetKeySequenceCounter(otInstance *aInstance, uint32_t aKeySequenceCounter);
/**
* Get the thrKeySwitchGuardTime
*
* @param[in] aInstance A pointer to an OpenThread instance.
*
* @returns The thrKeySwitchGuardTime value (in hours).
*
* @sa otSetKeySwitchGuardTime
*/
uint32_t otGetKeySwitchGuardTime(otInstance *aInstance);
/**
* Set the thrKeySwitchGuardTime
*
* @param[in] aInstance A pointer to an OpenThread instance.
* @param[in] aKeySwitchGuardTime The thrKeySwitchGuardTime value (in hours).
*
* @sa otGetKeySwitchGuardTime
*/
void otSetKeySwitchGuardTime(otInstance *aInstance, uint32_t aKeySwitchGuardTime);
/**
* Get the NETWORK_ID_TIMEOUT parameter used in the Router role.
*
src/cli/README.md
+26 -6
View File
@@ -804,22 +804,42 @@ Stop the Joiner role.
Done
```
### keysequence
### keysequence counter
Get the Thread Key Sequence.
Get the Thread Key Sequence Counter.
```bash
> keysequence
> keysequence counter
10
Done
```
### keysequence \<keysequence\>
### keysequence counter \<counter\>
Set the Thread Key Sequence.
Set the Thread Key Sequence Counter.
```bash
> keysequence 10
> keysequence counter 10
Done
```
### keysequence guardtime
Get Thread Key Switch Guard Time (in hours)
```bash
> keysequence guardtime
0
Done
```
### keysequence guardtime \<guardtime\>
Set Thread Key Switch Guard Time (in hours)
0 means Thread Key Switch imediately if key index match
```bash
> keysequence guardtime 0
Done
```
src/cli/cli.cpp
+22 -5
View File
@@ -765,14 +765,31 @@ void Interpreter::ProcessKeySequence(int argc, char *argv[])
ThreadError error = kThreadError_None;
long value;
if (argc == 0)
VerifyOrExit(argc == 1 || argc == 2, error = kThreadError_Parse);
if (strcmp(argv[0], "counter") == 0)
{
sServer->OutputFormat("%d\r\n", otGetKeySequenceCounter(mInstance));
if (argc == 1)
{
sServer->OutputFormat("%d\r\n", otGetKeySequenceCounter(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[1], value));
otSetKeySequenceCounter(mInstance, static_cast<uint32_t>(value));
}
}
else
else if (strcmp(argv[0], "guardtime") == 0)
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetKeySequenceCounter(mInstance, static_cast<uint32_t>(value));
if (argc == 1)
{
sServer->OutputFormat("%d\r\n", otGetKeySwitchGuardTime(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[1], value));
otSetKeySwitchGuardTime(mInstance, static_cast<uint32_t>(value));
}
}
exit:
src/core/openthread.cpp
+10
View File
@@ -497,6 +497,16 @@ void otSetKeySequenceCounter(otInstance *aInstance, uint32_t aKeySequenceCounter
aInstance->mThreadNetif.GetKeyManager().SetCurrentKeySequence(aKeySequenceCounter);
}
uint32_t otGetKeySwitchGuardTime(otInstance *aInstance)
{
return aInstance->mThreadNetif.GetKeyManager().GetKeySwitchGuardTime();
}
void otSetKeySwitchGuardTime(otInstance *aInstance, uint32_t aKeySwitchGuardTime)
{
aInstance->mThreadNetif.GetKeyManager().SetKeySwitchGuardTime(aKeySwitchGuardTime);
}
uint8_t otGetNetworkIdTimeout(otInstance *aInstance)
{
return aInstance->mThreadNetif.GetMle().GetNetworkIdTimeout();
src/core/thread/key_manager.cpp
+6 -9
View File
@@ -92,7 +92,7 @@ ThreadError KeyManager::SetMasterKey(const void *aKey, uint8_t aKeyLength)
mKeySequence = 0;
ComputeKey(mKeySequence, mKey);
mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE);
mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE_COUNTER);
exit:
return error;
@@ -124,10 +124,6 @@ uint32_t KeyManager::GetCurrentKeySequence(void) const
void KeyManager::SetCurrentKeySequence(uint32_t aKeySequence)
{
uint32_t now;
uint32_t guardStartTimestamp;
uint32_t guardEndTimestamp;
if (aKeySequence == mKeySequence)
{
ExitNow();
@@ -135,12 +131,13 @@ void KeyManager::SetCurrentKeySequence(uint32_t aKeySequence)
// Check if the guard timer has expired if key rotation is requested.
if ((aKeySequence == (mKeySequence + 1)) &&
(mKeySwitchGuardTime != 0) &&
mKeyRotationTimer.IsRunning() &&
mKeySwitchGuardEnabled)
{
now = Timer::GetNow();
guardStartTimestamp = mKeyRotationTimer.Gett0();
guardEndTimestamp = guardStartTimestamp + Timer::HoursToMsec(mKeySwitchGuardTime);
uint32_t now = Timer::GetNow();
uint32_t guardStartTimestamp = mKeyRotationTimer.Gett0();
uint32_t guardEndTimestamp = guardStartTimestamp + Timer::HoursToMsec(mKeySwitchGuardTime);
// Check for timer overflow
if (guardEndTimestamp < mKeyRotationTimer.Gett0())
@@ -171,7 +168,7 @@ void KeyManager::SetCurrentKeySequence(uint32_t aKeySequence)
mKeyRotationTimer.Start(Timer::HoursToMsec(mKeyRotationTime));
}
mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE);
mNetif.SetStateChangedFlags(OT_NET_KEY_SEQUENCE_COUNTER);
exit:
return;
src/ncp/ncp_base.cpp
+48 -7
View File
@@ -110,8 +110,9 @@ const NcpBase::GetPropertyHandlerEntry NcpBase::mGetPropertyHandlerTable[] =
{ SPINEL_PROP_NET_NETWORK_NAME, &NcpBase::GetPropertyHandler_NET_NETWORK_NAME },
{ SPINEL_PROP_NET_XPANID, &NcpBase::GetPropertyHandler_NET_XPANID },
{ SPINEL_PROP_NET_MASTER_KEY, &NcpBase::GetPropertyHandler_NET_MASTER_KEY },
{ SPINEL_PROP_NET_KEY_SEQUENCE, &NcpBase::GetPropertyHandler_NET_KEY_SEQUENCE },
{ SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER, &NcpBase::GetPropertyHandler_NET_KEY_SEQUENCE_COUNTER },
{ SPINEL_PROP_NET_PARTITION_ID, &NcpBase::GetPropertyHandler_NET_PARTITION_ID },
{ SPINEL_PROP_NET_KEY_SWITCH_GUARDTIME, &NcpBase::GetPropertyHandler_NET_KEY_SWITCH_GUARDTIME},
{ SPINEL_PROP_THREAD_LEADER_ADDR, &NcpBase::GetPropertyHandler_THREAD_LEADER_ADDR },
{ SPINEL_PROP_THREAD_PARENT, &NcpBase::GetPropertyHandler_THREAD_PARENT },
@@ -210,7 +211,8 @@ const NcpBase::SetPropertyHandlerEntry NcpBase::mSetPropertyHandlerTable[] =
{ SPINEL_PROP_NET_NETWORK_NAME, &NcpBase::SetPropertyHandler_NET_NETWORK_NAME },
{ SPINEL_PROP_NET_XPANID, &NcpBase::SetPropertyHandler_NET_XPANID },
{ SPINEL_PROP_NET_MASTER_KEY, &NcpBase::SetPropertyHandler_NET_MASTER_KEY },
{ SPINEL_PROP_NET_KEY_SEQUENCE, &NcpBase::SetPropertyHandler_NET_KEY_SEQUENCE },
{ SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER, &NcpBase::SetPropertyHandler_NET_KEY_SEQUENCE_COUNTER },
{ SPINEL_PROP_NET_KEY_SWITCH_GUARDTIME, &NcpBase::SetPropertyHandler_NET_KEY_SWITCH_GUARDTIME},
{ SPINEL_PROP_THREAD_LOCAL_LEADER_WEIGHT, &NcpBase::SetPropertyHandler_THREAD_LOCAL_LEADER_WEIGHT },
{ SPINEL_PROP_THREAD_ASSISTING_PORTS, &NcpBase::SetPropertyHandler_THREAD_ASSISTING_PORTS },
@@ -782,13 +784,13 @@ void NcpBase::UpdateChangedProps(void)
));
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_PARTITION_ID);
}
else if ((mChangedFlags & OT_NET_KEY_SEQUENCE) != 0)
else if ((mChangedFlags & OT_NET_KEY_SEQUENCE_COUNTER) != 0)
{
SuccessOrExit(HandleCommandPropertyGet(
SPINEL_HEADER_FLAG | SPINEL_HEADER_IID_0,
SPINEL_PROP_NET_KEY_SEQUENCE
SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER
));
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_KEY_SEQUENCE);
mChangedFlags &= ~static_cast<uint32_t>(OT_NET_KEY_SEQUENCE_COUNTER);
}
else if ((mChangedFlags & (OT_IP6_ADDRESS_ADDED | OT_IP6_ADDRESS_REMOVED)) != 0)
{
@@ -1756,7 +1758,7 @@ ThreadError NcpBase::GetPropertyHandler_NET_MASTER_KEY(uint8_t header, spinel_pr
);
}
ThreadError NcpBase::GetPropertyHandler_NET_KEY_SEQUENCE(uint8_t header, spinel_prop_key_t key)
ThreadError NcpBase::GetPropertyHandler_NET_KEY_SEQUENCE_COUNTER(uint8_t header, spinel_prop_key_t key)
{
return SendPropertyUpdate(
header,
@@ -1778,6 +1780,17 @@ ThreadError NcpBase::GetPropertyHandler_NET_PARTITION_ID(uint8_t header, spinel_
);
}
ThreadError NcpBase::GetPropertyHandler_NET_KEY_SWITCH_GUARDTIME(uint8_t header, spinel_prop_key_t key)
{
return SendPropertyUpdate(
header,
SPINEL_CMD_PROP_VALUE_IS,
key,
SPINEL_DATATYPE_UINT32_S,
otGetKeySwitchGuardTime(mInstance)
);
}
ThreadError NcpBase::GetPropertyHandler_THREAD_NETWORK_DATA_VERSION(uint8_t header, spinel_prop_key_t key)
{
return SendPropertyUpdate(
@@ -3309,7 +3322,7 @@ ThreadError NcpBase::SetPropertyHandler_NET_MASTER_KEY(uint8_t header, spinel_pr
return errorCode;
}
ThreadError NcpBase::SetPropertyHandler_NET_KEY_SEQUENCE(uint8_t header, spinel_prop_key_t key,
ThreadError NcpBase::SetPropertyHandler_NET_KEY_SEQUENCE_COUNTER(uint8_t header, spinel_prop_key_t key,
const uint8_t *value_ptr,
uint16_t value_len)
{
@@ -3337,6 +3350,34 @@ ThreadError NcpBase::SetPropertyHandler_NET_KEY_SEQUENCE(uint8_t header, spinel_
return errorCode;
}
ThreadError NcpBase::SetPropertyHandler_NET_KEY_SWITCH_GUARDTIME(uint8_t header, spinel_prop_key_t key,
const uint8_t *value_ptr,
uint16_t value_len)
{
unsigned int i(0);
spinel_ssize_t parsedLength;
ThreadError errorCode = kThreadError_None;
parsedLength = spinel_datatype_unpack(
value_ptr,
value_len,
SPINEL_DATATYPE_UINT32_S,
&i
);
if (parsedLength > 0)
{
otSetKeySwitchGuardTime(mInstance, i);
errorCode = HandleCommandPropertyGet(header, key);
}
else
{
errorCode = SendLastStatus(header, SPINEL_STATUS_PARSE_ERROR);
}
return errorCode;
}
ThreadError NcpBase::SetPropertyHandler_THREAD_LOCAL_LEADER_WEIGHT(uint8_t header, spinel_prop_key_t key,
const uint8_t *value_ptr, uint16_t value_len)
{
src/ncp/ncp_base.hpp
+5 -2
View File
@@ -298,8 +298,9 @@ private:
ThreadError GetPropertyHandler_NET_NETWORK_NAME(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_NET_XPANID(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_NET_MASTER_KEY(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_NET_KEY_SEQUENCE(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_NET_KEY_SEQUENCE_COUNTER(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_NET_PARTITION_ID(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_NET_KEY_SWITCH_GUARDTIME(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_THREAD_LEADER(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_IPV6_ML_PREFIX(uint8_t header, spinel_prop_key_t key);
ThreadError GetPropertyHandler_IPV6_ML_ADDR(uint8_t header, spinel_prop_key_t key);
@@ -368,7 +369,9 @@ private:
uint16_t value_len);
ThreadError SetPropertyHandler_NET_MASTER_KEY(uint8_t header, spinel_prop_key_t key, const uint8_t *value_ptr,
uint16_t value_len);
ThreadError SetPropertyHandler_NET_KEY_SEQUENCE(uint8_t header, spinel_prop_key_t key, const uint8_t *value_ptr,
ThreadError SetPropertyHandler_NET_KEY_SEQUENCE_COUNTER(uint8_t header, spinel_prop_key_t key, const uint8_t *value_ptr,
uint16_t value_len);
ThreadError SetPropertyHandler_NET_KEY_SWITCH_GUARDTIME(uint8_t header, spinel_prop_key_t key, const uint8_t *value_ptr,
uint16_t value_len);
ThreadError SetPropertyHandler_STREAM_NET_INSECURE(uint8_t header, spinel_prop_key_t key, const uint8_t *value_ptr,
uint16_t value_len);
src/ncp/spinel.c
+6 -2
View File
@@ -1028,14 +1028,18 @@ spinel_prop_key_to_cstr(spinel_prop_key_t prop_key)
ret = "PROP_NET_MASTER_KEY";
break;
case SPINEL_PROP_NET_KEY_SEQUENCE:
ret = "PROP_NET_KEY_SEQUENCE";
case SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER:
ret = "PROP_NET_KEY_SEQUENCE_COUNTER";
break;
case SPINEL_PROP_NET_PARTITION_ID:
ret = "PROP_NET_PARTITION_ID";
break;
case SPINEL_PROP_NET_KEY_SWITCH_GUARDTIME:
ret = "PROP_NET_KEY_SWITCH_GUARDTIME";
break;
case SPINEL_PROP_THREAD_LEADER_ADDR:
ret = "PROP_THREAD_LEADER_ADDR";
break;
src/ncp/spinel.h
+5 -1
View File
@@ -394,7 +394,8 @@ typedef enum
SPINEL_PROP_NET_NETWORK_NAME = SPINEL_PROP_NET__BEGIN + 4, ///< [U]
SPINEL_PROP_NET_XPANID = SPINEL_PROP_NET__BEGIN + 5, ///< [D]
SPINEL_PROP_NET_MASTER_KEY = SPINEL_PROP_NET__BEGIN + 6, ///< [D]
SPINEL_PROP_NET_KEY_SEQUENCE = SPINEL_PROP_NET__BEGIN + 7, ///< [L]
SPINEL_PROP_NET_KEY_SEQUENCE_COUNTER
= SPINEL_PROP_NET__BEGIN + 7, ///< [L]
SPINEL_PROP_NET_PARTITION_ID = SPINEL_PROP_NET__BEGIN + 8, ///< [L]
/// Require Join Existing
@@ -418,6 +419,9 @@ typedef enum
SPINEL_PROP_NET_REQUIRE_JOIN_EXISTING
= SPINEL_PROP_NET__BEGIN + 9,
SPINEL_PROP_NET_KEY_SWITCH_GUARDTIME
= SPINEL_PROP_NET__BEGIN + 10, ///< [L]
SPINEL_PROP_NET__END = 0x50,
SPINEL_PROP_THREAD__BEGIN = 0x50,
tests/scripts/thread-cert/Cert_5_8_01_KeySynchronization.py
+4 -2
View File
@@ -45,11 +45,13 @@ class Cert_5_8_1_KeySynchronization(unittest.TestCase):
self.nodes[LEADER].set_mode('rsdn')
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].set_key_switch_guardtime(0)
self.nodes[ED].set_panid(0xface)
self.nodes[ED].set_mode('rsn')
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].set_key_switch_guardtime(0)
def tearDown(self):
for node in list(self.nodes.values()):
@@ -70,8 +72,8 @@ class Cert_5_8_1_KeySynchronization(unittest.TestCase):
if 'ff:fe00' not in addr:
self.assertTrue(self.nodes[ED].ping(addr))
key_sequence = self.nodes[ED].get_key_sequence()
self.nodes[ED].set_key_sequence(key_sequence + 10)
key_sequence_counter = self.nodes[ED].get_key_sequence_counter()
self.nodes[ED].set_key_sequence_counter(key_sequence_counter + 10)
addrs = self.nodes[LEADER].get_addrs()
for addr in addrs:
tests/scripts/thread-cert/Cert_5_8_02_KeyIncrement.py
+4 -2
View File
@@ -44,12 +44,14 @@ class Cert_5_8_2_KeyIncrement(unittest.TestCase):
self.nodes[LEADER].set_panid(0xface)
self.nodes[LEADER].set_mode('rsdn')
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER].get_addr64())
self.nodes[LEADER].set_key_switch_guardtime(0)
self.nodes[LEADER].enable_whitelist()
self.nodes[ROUTER].set_panid(0xface)
self.nodes[ROUTER].set_mode('rsdn')
self.nodes[ROUTER].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ROUTER].enable_whitelist()
self.nodes[ROUTER].set_key_switch_guardtime(0)
self.nodes[ROUTER].set_router_selection_jitter(1)
def tearDown(self):
@@ -69,8 +71,8 @@ class Cert_5_8_2_KeyIncrement(unittest.TestCase):
for addr in addrs:
self.assertTrue(self.nodes[LEADER].ping(addr))
key_sequence = self.nodes[LEADER].get_key_sequence()
self.nodes[LEADER].set_key_sequence(key_sequence + 1)
key_sequence_counter = self.nodes[LEADER].get_key_sequence_counter()
self.nodes[LEADER].set_key_sequence_counter(key_sequence_counter + 1)
addrs = self.nodes[ROUTER].get_addrs()
for addr in addrs:
tests/scripts/thread-cert/Cert_5_8_03_KeyIncrementRollOver.py
+5 -3
View File
@@ -45,12 +45,14 @@ class Cert_5_8_3_KeyIncrementRollOver(unittest.TestCase):
self.nodes[LEADER].set_mode('rsdn')
self.nodes[LEADER].add_whitelist(self.nodes[ROUTER].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].set_key_sequence(127)
self.nodes[LEADER].set_key_switch_guardtime(0)
self.nodes[LEADER].set_key_sequence_counter(127)
self.nodes[ROUTER].set_panid(0xface)
self.nodes[ROUTER].set_mode('rsdn')
self.nodes[ROUTER].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ROUTER].enable_whitelist()
self.nodes[ROUTER].set_key_switch_guardtime(0)
self.nodes[ROUTER].set_router_selection_jitter(1)
def tearDown(self):
@@ -71,8 +73,8 @@ class Cert_5_8_3_KeyIncrementRollOver(unittest.TestCase):
for addr in addrs:
self.assertTrue(self.nodes[LEADER].ping(addr))
key_sequence = self.nodes[LEADER].get_key_sequence()
self.nodes[LEADER].set_key_sequence(key_sequence + 1)
key_sequence_counter = self.nodes[LEADER].get_key_sequence_counter()
self.nodes[LEADER].set_key_sequence_counter(key_sequence_counter + 1)
addrs = self.nodes[ROUTER].get_addrs()
for addr in addrs:
tests/scripts/thread-cert/Cert_6_6_01_KeyIncrement.py
+4 -2
View File
@@ -45,11 +45,13 @@ class Cert_6_6_1_KeyIncrement(unittest.TestCase):
self.nodes[LEADER].set_mode('rsdn')
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].set_key_switch_guardtime(0)
self.nodes[ED].set_panid(0xface)
self.nodes[ED].set_mode('rsn')
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].set_key_switch_guardtime(0)
def tearDown(self):
for node in list(self.nodes.values()):
@@ -68,8 +70,8 @@ class Cert_6_6_1_KeyIncrement(unittest.TestCase):
for addr in addrs:
self.assertTrue(self.nodes[LEADER].ping(addr))
key_sequence = self.nodes[LEADER].get_key_sequence()
self.nodes[LEADER].set_key_sequence(key_sequence + 1)
key_sequence_counter = self.nodes[LEADER].get_key_sequence_counter()
self.nodes[LEADER].set_key_sequence_counter(key_sequence_counter + 1)
addrs = self.nodes[ED].get_addrs()
for addr in addrs:
tests/scripts/thread-cert/Cert_6_6_02_KeyIncrementRollOver.py
+5 -3
View File
@@ -45,12 +45,14 @@ class Cert_6_6_2_KeyIncrement1(unittest.TestCase):
self.nodes[LEADER].set_mode('rsdn')
self.nodes[LEADER].add_whitelist(self.nodes[ED].get_addr64())
self.nodes[LEADER].enable_whitelist()
self.nodes[LEADER].set_key_sequence(127)
self.nodes[LEADER].set_key_switch_guardtime(0)
self.nodes[LEADER].set_key_sequence_counter(127)
self.nodes[ED].set_panid(0xface)
self.nodes[ED].set_mode('rsn')
self.nodes[ED].add_whitelist(self.nodes[LEADER].get_addr64())
self.nodes[ED].enable_whitelist()
self.nodes[ED].set_key_switch_guardtime(0)
def tearDown(self):
for node in list(self.nodes.values()):
@@ -70,8 +72,8 @@ class Cert_6_6_2_KeyIncrement1(unittest.TestCase):
for addr in addrs:
self.assertTrue(self.nodes[LEADER].ping(addr))
key_sequence = self.nodes[LEADER].get_key_sequence()
self.nodes[LEADER].set_key_sequence(key_sequence + 1)
key_sequence_counter = self.nodes[LEADER].get_key_sequence_counter()
self.nodes[LEADER].set_key_sequence_counter(key_sequence_counter + 1)
addrs = self.nodes[ED].get_addrs()
for addr in addrs:
tests/scripts/thread-cert/node.py
+11 -6
View File
@@ -241,16 +241,21 @@ class Node:
self.send_command(cmd)
self.pexpect.expect('Done')
def get_key_sequence(self):
self.send_command('keysequence')
def get_key_sequence_counter(self):
self.send_command('keysequence counter')
i = self.pexpect.expect('(\d+)\r\n')
if i == 0:
key_sequence = int(self.pexpect.match.groups()[0])
key_sequence_counter = int(self.pexpect.match.groups()[0])
self.pexpect.expect('Done')
return key_sequence
return key_sequence_counter
def set_key_sequence(self, key_sequence):
cmd = 'keysequence %d' % key_sequence
def set_key_sequence_counter(self, key_sequence_counter):
cmd = 'keysequence counter %d' % key_sequence_counter
self.send_command(cmd)
self.pexpect.expect('Done')
def set_key_switch_guardtime(self, key_switch_guardtime):
cmd = 'keysequence guardtime %d' % key_switch_guardtime
self.send_command(cmd)
self.pexpect.expect('Done')
tools/harness-thci/ARM.py
+25 -2
View File
@@ -533,6 +533,28 @@ class ARM(IThci):
except Exception, e:
ModuleHelper.WriteIntoDebugLogger("setSecurityPolicy() Error: " + str(e))
def __setKeySwitchGuardTime(self, iKeySwitchGuardTime):
""" set the Key switch guard time
Args:
iKeySwitchGuardTime: key switch guard time
Returns:
True: successful to set key switch guard time
False: fail to set key switch guard time
"""
print '%s call setKeySwitchGuardTime' % self.port
print iKeySwitchGuardTime
try:
cmd = 'keysequence guardtime %s' % str(iKeySwitchGuardTime)
if self.__sendCommand(cmd)[0] == 'Done':
time.sleep(1)
return True
else:
return False
except Exception, e:
ModuleHelper.WriteIntoDebugLogger("setKeySwitchGuardTime() Error; " + str(e))
def closeConnection(self):
"""close current serial port connection"""
print '%s call closeConnection' % self.port
@@ -919,6 +941,7 @@ class ARM(IThci):
# set Thread device with a given role
self.__setDeviceRole(role)
self.__setKeySwitchGuardTime(0)
# start OpenThread
self.__startOpenThread()
@@ -1381,7 +1404,7 @@ class ARM(IThci):
print '%s call setKeySequenceCounter' % self.port
print iKeySequenceValue
try:
cmd = 'keysequence %s' % str(iKeySequenceValue)
cmd = 'keysequence counter %s' % str(iKeySequenceValue)
if self.__sendCommand(cmd)[0] == 'Done':
time.sleep(1)
return True
@@ -1394,7 +1417,7 @@ class ARM(IThci):
"""get current Thread Network key sequence"""
print '%s call getKeySequenceCounter' % self.port
keySequence = ''
keySequence = self.__sendCommand('keysequence')[0]
keySequence = self.__sendCommand('keysequence counter')[0]
return keySequence
def incrementKeySequenceCounter(self, iIncrementValue=1):
tools/spinel-cli/spinel-cli.py
+31 -7
View File
@@ -850,22 +850,46 @@ class SpinelCliCmd(Cmd, SpinelCodec):
def do_keysequence(self, line):
"""
keysequence
keysequence counter
Get the Thread Key Sequence.
Get the Thread Key Sequence Counter.
> keysequence
> keysequence counter
10
Done
keysequence <keysequence>
keysequence counter <counter>
Set the Thread Key Sequence.
Set the Thread Key Sequence Counter.
> keysequence 10
> keysequence counter 10
Done
keysequence guardtime
Get the thrKeySwitchGuardTime (in hours).
> keysequence guardtime
0
Done
keysequence guardtime <guardtime>
Set the thrKeySwitchGuardTime (in hours).
> keysequence guardtime 0
Done
"""
self.handle_property(line, SPINEL.PROP_NET_KEY_SEQUENCE, 'L')
args = line.split(" ")
if args[0] == "counter":
newline = line.replace("counter","")
self.handle_property(newline, SPINEL.PROP_NET_KEY_SEQUENCE_COUNTER, 'L')
elif args[0] == "guardtime":
newline = line.replace("guardtime","")
self.handle_property(newline, SPINEL.PROP_NET_KEY_SWITCH_GUARDTIME, 'L')
def do_leaderdata(self, line):
"""
tools/spinel-cli/spinel/codec.py
+5 -2
View File
@@ -339,10 +339,12 @@ class SpinelPropertyHandler(SpinelCodec):
def NET_MASTER_KEY(self, _, payload): return self.parse_D(payload)
def NET_KEY_SEQUENCE(self, _, payload): return self.parse_L(payload)
def NET_KEY_SEQUENCE_COUNTER(self, _, payload): return self.parse_L(payload)
def NET_PARTITION_ID(self, _, payload): return self.parse_L(payload)
def NET_KEY_SWITCH_GUARDTIME(self, _, payload): return self.parse_L(payload)
def THREAD_LEADER_ADDR(self, _, payload): return self.parse_6(payload)
def THREAD_PARENT(self, _wpan_api, payload): pass
@@ -658,8 +660,9 @@ SPINEL_PROP_DISPATCH = {
SPINEL.PROP_NET_NETWORK_NAME: WPAN_PROP_HANDLER.NET_NETWORK_NAME,
SPINEL.PROP_NET_XPANID: WPAN_PROP_HANDLER.NET_XPANID,
SPINEL.PROP_NET_MASTER_KEY: WPAN_PROP_HANDLER.NET_MASTER_KEY,
SPINEL.PROP_NET_KEY_SEQUENCE: WPAN_PROP_HANDLER.NET_KEY_SEQUENCE,
SPINEL.PROP_NET_KEY_SEQUENCE_COUNTER: WPAN_PROP_HANDLER.NET_KEY_SEQUENCE_COUNTER,
SPINEL.PROP_NET_PARTITION_ID: WPAN_PROP_HANDLER.NET_PARTITION_ID,
SPINEL.PROP_NET_KEY_SWITCH_GUARDTIME: WPAN_PROP_HANDLER.NET_KEY_SWITCH_GUARDTIME,
SPINEL.PROP_THREAD_LEADER_ADDR: WPAN_PROP_HANDLER.THREAD_LEADER_ADDR,
SPINEL.PROP_THREAD_PARENT: WPAN_PROP_HANDLER.THREAD_PARENT,
tools/spinel-cli/spinel/const.py
+2 -1
View File
@@ -128,8 +128,9 @@ class SPINEL(object):
PROP_NET_NETWORK_NAME = PROP_NET__BEGIN + 4 # < [U]
PROP_NET_XPANID = PROP_NET__BEGIN + 5 # < [D]
PROP_NET_MASTER_KEY = PROP_NET__BEGIN + 6 # < [D]
PROP_NET_KEY_SEQUENCE = PROP_NET__BEGIN + 7 # < [L]
PROP_NET_KEY_SEQUENCE_COUNTER = PROP_NET__BEGIN + 7 # < [L]
PROP_NET_PARTITION_ID = PROP_NET__BEGIN + 8 # < [L]
PROP_NET_KEY_SWITCH_GUARDTIME = PROP_NET__BEGIN + 10 # < [L]
PROP_NET__END = 0x50
PROP_THREAD__BEGIN = 0x50
tools/spinel-cli/spinel/test_codec.py
+1 -1
View File
@@ -43,7 +43,7 @@ class TestCodec(unittest.TestCase):
SPINEL.PROP_MAC_15_4_PANID: 65535,
SPINEL.PROP_NCP_VERSION: "OPENTHREAD",
SPINEL.PROP_NET_ROLE: 0,
SPINEL.PROP_NET_KEY_SEQUENCE: 5,
SPINEL.PROP_NET_KEY_SEQUENCE_COUNTER: 5,
SPINEL.PROP_NET_NETWORK_NAME: "OpenThread",
SPINEL.PROP_THREAD_MODE: 0xF,
}