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

[config] commissioner (#4020)

Browse Source
This commit is contained in:
Jonathan Hui
2019-07-16 11:38:00 -07:00
parent 6c8a9a8661
commit f72f792874
39 changed files with 151 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/script.sh
+2 -3
View File
@@ -62,13 +62,13 @@ python --version || die
-DOPENTHREAD_CONFIG_CHANNEL_MONITOR_ENABLE=1 \
-DOPENTHREAD_CONFIG_CHILD_SUPERVISION_ENABLE=1 \
-DOPENTHREAD_CONFIG_COAP_API_ENABLE=1 \
-DOPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE=1"
-DOPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE=1 \
-DOPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1"
scan-build ./configure \
--enable-builtin-mbedtls=no \
--enable-cert-log \
--enable-cli \
--enable-commissioner \
--enable-dhcp6-client \
--enable-dhcp6-server \
--enable-diag \
@@ -98,7 +98,6 @@ python --version || die
--enable-builtin-mbedtls=no \
--enable-cert-log \
--enable-cli \
--enable-commissioner \
--enable-dhcp6-client \
--enable-dhcp6-server \
--enable-diag \
Android.mk
+1 -1
View File
@@ -54,7 +54,7 @@ endif
ifeq ($(TARGET_PRODUCT),generic)
OPENTHREAD_COMMON_FLAGS += \
-DOPENTHREAD_CONFIG_COAP_API_ENABLE=1 \
-DOPENTHREAD_ENABLE_COMMISSIONER=1 \
-DOPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1 \
-DOPENTHREAD_ENABLE_DHCP6_CLIENT=1 \
-DOPENTHREAD_ENABLE_DHCP6_SERVER=1 \
-DOPENTHREAD_ENABLE_DNS_CLIENT=1 \
Makefile.am
-1
View File
@@ -34,7 +34,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-address-sanitizer \
--enable-cert-log \
--enable-cli \
--enable-commissioner \
--enable-dhcp6-client \
--enable-dhcp6-server \
--enable-diag \
configure.ac
-33
View File
@@ -897,38 +897,6 @@ AC_SUBST(OPENTHREAD_ENABLE_PLATFORM_NETIF)
AM_CONDITIONAL([OPENTHREAD_ENABLE_PLATFORM_NETIF], [test "${enable_platform_netif}" = 'yes'])
AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_PLATFORM_NETIF], [${OPENTHREAD_ENABLE_PLATFORM_NETIF}], [Define to 1 to enable platform Netif.])
#
# Thread Commissioner
#
AC_ARG_ENABLE(commissioner,
[AS_HELP_STRING([--enable-commissioner],[Enable commissioner support @<:@default=no@:>@.])],
[
case "${enableval}" in
no|yes)
enable_commissioner=${enableval}
;;
*)
AC_MSG_ERROR([Invalid value ${enable_commissioner} for --enable-commissioner])
;;
esac
],
[enable_commissioner=no])
if test "$enable_commissioner" = "yes"; then
OPENTHREAD_ENABLE_COMMISSIONER=1
else
OPENTHREAD_ENABLE_COMMISSIONER=0
fi
AC_MSG_CHECKING([whether to enable the commissioner])
AC_MSG_RESULT(${enable_commissioner})
AC_SUBST(OPENTHREAD_ENABLE_COMMISSIONER)
AM_CONDITIONAL([OPENTHREAD_ENABLE_COMMISSIONER], [test "${enable_commissioner}" = "yes"])
AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_COMMISSIONER],[${OPENTHREAD_ENABLE_COMMISSIONER}],[Define to 1 to enable the commissioner role.])
#
# Thread Joiner
#
@@ -1814,7 +1782,6 @@ AC_MSG_NOTICE([
OpenThread MTD Network Diagnostic support : ${enable_mtd_network_diagnostic}
OpenThread builtin mbedtls support : ${enable_builtin_mbedtls}
OpenThread UDP forward support : ${enable_udp_forward}
OpenThread Commissioner support : ${enable_commissioner}
OpenThread Joiner support : ${enable_joiner}
OpenThread Jam Detection support : ${enable_jam_detection}
OpenThread MAC Filter support : ${enable_mac_filter}
examples/apps/cli/README.md
+1 -1
View File
@@ -124,4 +124,4 @@ Done
## 4. Explore More
See the [OpenThread CLI Reference README.md](../../../src/cli/README.md) to explore more.
See the [OpenThread CLI Reference README.md](../../../src/cli/README.md) to explore more.
examples/common-switches.mk
+1 -1
View File
@@ -83,7 +83,7 @@ COMMONCFLAGS += -DOPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE=1
endif
ifeq ($(COMMISSIONER),1)
configure_OPTIONS += --enable-commissioner
COMMONCFLAGS += -DOPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1
endif
ifeq ($(COVERAGE),1)
examples/platforms/nrf52811/DIAG.md
+1 -1
View File
@@ -151,4 +151,4 @@ Start transmiting messages with specified interval.
### diag transmit carrier
Start transmitting continuous carrier wave.
[DIAG]: ./../../../src/diag/README.md
[DIAG]: ./../../../src/diag/README.md
examples/platforms/nrf52811/openthread-core-nrf52811-config.h
+1 -1
View File
@@ -233,7 +233,7 @@
* context used by Header IE related features.
*
*/
#if OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_JOINER || OPENTHREAD_CONFIG_HEADER_IE_SUPPORT
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE || OPENTHREAD_ENABLE_JOINER || OPENTHREAD_CONFIG_HEADER_IE_SUPPORT
#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 1
#else
#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 0
examples/platforms/nrf52840/DIAG.md
+1 -1
View File
@@ -151,4 +151,4 @@ Start transmiting messages with specified interval.
### diag transmit carrier
Start transmitting continuous carrier wave.
[DIAG]: ./../../../src/diag/README.md
[DIAG]: ./../../../src/diag/README.md
src/cli/README_DATASET.md
+1 -1
View File
@@ -403,4 +403,4 @@ Set security policy.
```bash
> dataset securitypolicy 672 onrcb
Done
```
```
src/cli/cli.cpp
+3 -3
View File
@@ -106,7 +106,7 @@ const struct Command Interpreter::sCommands[] = {
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
{"coaps", &Interpreter::ProcessCoapSecure},
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
{"commissioner", &Interpreter::ProcessCommissioner},
#endif
#if OPENTHREAD_FTD
@@ -237,7 +237,7 @@ Interpreter::Interpreter(Instance *aInstance)
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
, mCoapSecure(*this)
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
, mCommissioner(*this)
#endif
#if OPENTHREAD_ENABLE_JOINER
@@ -3070,7 +3070,7 @@ void Interpreter::ProcessVersion(int argc, char *argv[])
AppendResult(OT_ERROR_NONE);
}
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
void Interpreter::ProcessCommissioner(int argc, char *argv[])
{
src/cli/cli.hpp
+2 -2
View File
@@ -208,7 +208,7 @@ private:
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
void ProcessCoapSecure(int argc, char *argv[]);
#endif // OPENTHREAD_CONFIG_COAP_API_ENABLE
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
void ProcessCommissioner(int argc, char *argv[]);
#endif
#if OPENTHREAD_FTD
@@ -397,7 +397,7 @@ private:
CoapSecure mCoapSecure;
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
Commissioner mCommissioner;
#endif
src/cli/cli_commissioner.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include "cli/cli.hpp"
#include "cli/cli_server.hpp"
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
namespace ot {
namespace Cli {
@@ -441,4 +441,4 @@ void Commissioner::HandlePanIdConflict(uint16_t aPanId, uint32_t aChannelMask)
} // namespace Cli
} // namespace ot
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
src/cli/cli_commissioner.hpp
+2 -2
View File
@@ -38,7 +38,7 @@
#include <openthread/commissioner.h>
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
namespace ot {
namespace Cli {
@@ -120,6 +120,6 @@ private:
} // namespace Cli
} // namespace ot
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
#endif // CLI_COMMISSIONER_HPP_
src/core/Makefile.am
+1
View File
@@ -324,6 +324,7 @@ HEADERS_COMMON = \
config/channel_monitor.h \
config/child_supervision.h \
config/coap.h \
config/commissioner.h \
config/openthread-core-config-check.h \
config/openthread-core-default-config.h \
crypto/aes_ccm.hpp \
src/core/api/commissioner_api.cpp
+14 -14
View File
@@ -47,7 +47,7 @@ otError otCommissionerStart(otInstance * aInstance,
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
@@ -72,7 +72,7 @@ otError otCommissionerStop(otInstance *aInstance)
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
SuccessOrExit(error = instance.Get<MeshCoP::Commissioner>().Stop());
@@ -88,7 +88,7 @@ otError otCommissionerAddJoiner(otInstance *aInstance, const otExtAddress *aEui6
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error =
@@ -107,7 +107,7 @@ otError otCommissionerRemoveJoiner(otInstance *aInstance, const otExtAddress *aE
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().RemoveJoiner(static_cast<const Mac::ExtAddress *>(aEui64), 0);
@@ -123,7 +123,7 @@ otError otCommissionerSetProvisioningUrl(otInstance *aInstance, const char *aPro
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().SetProvisioningUrl(aProvisioningUrl);
@@ -139,7 +139,7 @@ const char *otCommissionerGetProvisioningUrl(otInstance *aInstance, uint16_t *aL
{
const char *url = NULL;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
if (aLength != NULL)
@@ -162,7 +162,7 @@ otError otCommissionerAnnounceBegin(otInstance * aInstance,
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().GetAnnounceBeginClient().SendRequest(
@@ -189,7 +189,7 @@ otError otCommissionerEnergyScan(otInstance * aInstance,
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().GetEnergyScanClient().SendQuery(
@@ -218,7 +218,7 @@ otError otCommissionerPanIdQuery(otInstance * aInstance,
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().GetPanIdQueryClient().SendQuery(
@@ -239,7 +239,7 @@ otError otCommissionerSendMgmtGet(otInstance *aInstance, const uint8_t *aTlvs, u
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().SendMgmtCommissionerGetRequest(aTlvs, aLength);
@@ -259,7 +259,7 @@ otError otCommissionerSendMgmtSet(otInstance * aInstance,
{
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
error = instance.Get<MeshCoP::Commissioner>().SendMgmtCommissionerSetRequest(*aDataset, aTlvs, aLength);
@@ -277,7 +277,7 @@ uint16_t otCommissionerGetSessionId(otInstance *aInstance)
{
uint16_t sessionId = 0;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
sessionId = instance.Get<MeshCoP::Commissioner>().GetSessionId();
@@ -292,7 +292,7 @@ otCommissionerState otCommissionerGetState(otInstance *aInstance)
{
otCommissionerState state = OT_COMMISSIONER_STATE_DISABLED;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
Instance &instance = *static_cast<Instance *>(aInstance);
state = instance.Get<MeshCoP::Commissioner>().GetState();
@@ -313,7 +313,7 @@ otError otCommissionerGeneratePSKc(otInstance * aInstance,
otError error = OT_ERROR_DISABLED_FEATURE;
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
error = MeshCoP::Commissioner::GeneratePSKc(aPassPhrase, aNetworkName, *aExtPanId, aPSKc);
#else
OT_UNUSED_VARIABLE(aInstance);
src/core/common/instance.hpp
+1 -1
View File
@@ -570,7 +570,7 @@ template <> inline TimeSync &Instance::Get(void)
}
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
template <> inline MeshCoP::Commissioner &Instance::Get(void)
{
return mThreadNetif.mCommissioner;
src/core/config/commissioner.h
+58
View File
@@ -0,0 +1,58 @@
/*
* Copyright (c) 2019, The OpenThread Authors.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holder nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @file
* This file includes compile-time configurations for the Commissioner.
*
*/
#ifndef CONFIG_COMMISSIONER_H_
#define CONFIG_COMMISSIONER_H_
/**
* @def OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
*
* Define to 1 to enable Commissioner support.
*
*/
#ifndef OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
#endif
/**
* @def OPENTHREAD_CONFIG_COMMISSIONER_MAX_JOINER_ENTRIES
*
* The maximum number of Joiner entries maintained by the Commissioner.
*
*/
#ifndef OPENTHREAD_CONFIG_COMMISSIONER_MAX_JOINER_ENTRIES
#define OPENTHREAD_CONFIG_COMMISSIONER_MAX_JOINER_ENTRIES 2
#endif
#endif // CONFIG_COMMISSIONER_H_
src/core/config/openthread-core-default-config.h
+1 -11
View File
@@ -400,17 +400,7 @@
#endif
/**
* @def OPENTHREAD_CONFIG_MAX_JOINER_ENTRIES
*
* The maximum number of Joiner entries maintained by the Commissioner.
*
*/
#ifndef OPENTHREAD_CONFIG_MAX_JOINER_ENTRIES
#define OPENTHREAD_CONFIG_MAX_JOINER_ENTRIES 2
#endif
/**
* @def OPENTHREAD_CONFIG_MAX_JOINER_ENTRIES
* @def OPENTHREAD_CONFIG_MAX_JOINER_ROUTER_ENTRIES
*
* The maximum number of Joiner Router entries that can be queued by the Joiner.
*
src/core/crypto/pbkdf2_cmac.cpp
+2 -2
View File
@@ -38,7 +38,7 @@
#include <mbedtls/cmac.h>
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
void otPbkdf2Cmac(const uint8_t *aPassword,
uint16_t aPasswordLen,
@@ -105,4 +105,4 @@ void otPbkdf2Cmac(const uint8_t *aPassword,
}
}
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
src/core/meshcop/announce_begin_client.cpp
+2 -2
View File
@@ -44,7 +44,7 @@
#include "thread/thread_netif.hpp"
#include "thread/thread_uri_paths.hpp"
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
namespace ot {
@@ -111,4 +111,4 @@ exit:
} // namespace ot
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
src/core/meshcop/commissioner.cpp
+2 -2
View File
@@ -49,7 +49,7 @@
#include "thread/thread_tlvs.hpp"
#include "thread/thread_uri_paths.hpp"
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
namespace ot {
namespace MeshCoP {
@@ -1123,4 +1123,4 @@ exit:
} // namespace MeshCoP
} // namespace ot
#endif // OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
src/core/meshcop/commissioner.hpp
+1 -1
View File
@@ -323,7 +323,7 @@ private:
bool mValid : 1;
bool mAny : 1;
};
Joiner mJoiners[OPENTHREAD_CONFIG_MAX_JOINER_ENTRIES];
Joiner mJoiners[OPENTHREAD_CONFIG_COMMISSIONER_MAX_JOINER_ENTRIES];
uint8_t mJoinerIid[8];
uint16_t mJoinerPort;
src/core/meshcop/dataset_manager.cpp
+2 -2
View File
@@ -418,7 +418,7 @@ otError DatasetManager::SendSetRequest(const otOperationalDataset &aDataset, con
SuccessOrExit(error = message->Init(OT_COAP_TYPE_CONFIRMABLE, OT_COAP_CODE_POST, mUriSet));
SuccessOrExit(error = message->SetPayloadMarker());
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
if (Get<Commissioner>().IsActive())
{
@@ -446,7 +446,7 @@ otError DatasetManager::SendSetRequest(const otOperationalDataset &aDataset, con
}
}
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
if (aDataset.mComponents.mIsActiveTimestampPresent)
{
src/core/meshcop/energy_scan_client.cpp
+2 -2
View File
@@ -45,7 +45,7 @@
#include "thread/thread_netif.hpp"
#include "thread/thread_uri_paths.hpp"
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
namespace ot {
@@ -164,4 +164,4 @@ exit:
} // namespace ot
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
src/core/meshcop/panid_query_client.cpp
+2 -2
View File
@@ -44,7 +44,7 @@
#include "thread/thread_netif.hpp"
#include "thread/thread_uri_paths.hpp"
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
namespace ot {
@@ -146,4 +146,4 @@ exit:
} // namespace ot
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
src/core/openthread-core-config.h
+2 -1
View File
@@ -50,9 +50,10 @@
#include "config/channel_monitor.h"
#include "config/child_supervision.h"
#include "config/coap.h"
#include "config/commissioner.h"
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE || OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || \
OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_JOINER
OPENTHREAD_CONFIG_COMMISSIONER_ENABLE || OPENTHREAD_ENABLE_JOINER
#define OPENTHREAD_CONFIG_DTLS_ENABLE 1
#endif
src/core/thread/thread_netif.cpp
+2 -2
View File
@@ -83,9 +83,9 @@ ThreadNetif::ThreadNetif(Instance &aInstance)
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
, mBorderAgent(aInstance)
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
, mCommissioner(aInstance)
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_DTLS_ENABLE
, mCoapSecure(aInstance)
#endif
src/core/thread/thread_netif.hpp
+4 -4
View File
@@ -43,9 +43,9 @@
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
#include "meshcop/border_agent.hpp"
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
#include "meshcop/commissioner.hpp"
#endif // OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
#include "meshcop/dataset_manager.hpp"
@@ -199,9 +199,9 @@ private:
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
MeshCoP::BorderAgent mBorderAgent;
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
MeshCoP::Commissioner mCommissioner;
#endif // OPENTHREAD_ENABLE_COMMISSIONER
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
#if OPENTHREAD_CONFIG_DTLS_ENABLE
Coap::CoapSecure mCoapSecure;
src/ncp/ncp_base.cpp
+2 -2
View File
@@ -922,7 +922,7 @@ bool NcpBase::HandlePropertySetForSpecialProperties(uint8_t aHeader, spinel_prop
ExitNow(aError = HandlePropertySet_SPINEL_PROP_NEST_STREAM_MFG(aHeader));
#endif
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
case SPINEL_PROP_THREAD_COMMISSIONER_ENABLED:
ExitNow(aError = HandlePropertySet_SPINEL_PROP_THREAD_COMMISSIONER_ENABLED(aHeader));
#endif
@@ -1807,7 +1807,7 @@ template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_CAPS>(void)
SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_NEST_LEGACY_INTERFACE));
#endif
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_THREAD_COMMISSIONER));
#endif
src/ncp/ncp_base.hpp
+2 -2
View File
@@ -304,7 +304,7 @@ protected:
static void HandleJamStateChange_Jump(bool aJamState, void *aContext);
void HandleJamStateChange(bool aJamState);
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
static void HandleCommissionerEnergyReport_Jump(uint32_t aChannelMask,
const uint8_t *aEnergyData,
uint8_t aLength,
@@ -413,7 +413,7 @@ protected:
otError HandlePropertySet_SPINEL_PROP_NEST_STREAM_MFG(uint8_t aHeader);
#endif
#if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
otError HandlePropertySet_SPINEL_PROP_THREAD_COMMISSIONER_ENABLED(uint8_t aHeader);
#endif // OPENTHREAD_FTD
src/ncp/ncp_base_dispatcher.cpp
+4 -4
View File
@@ -589,7 +589,7 @@ NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey)
handler = &NcpBase::HandlePropertyGet<SPINEL_PROP_MESHCOP_JOINER_STATE>;
break;
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
case SPINEL_PROP_MESHCOP_COMMISSIONER_STATE:
handler = &NcpBase::HandlePropertyGet<SPINEL_PROP_MESHCOP_COMMISSIONER_STATE>;
break;
@@ -928,7 +928,7 @@ NcpBase::PropertyHandler NcpBase::FindSetPropertyHandler(spinel_prop_key_t aKey)
handler = &NcpBase::HandlePropertySet<SPINEL_PROP_CHILD_SUPERVISION_INTERVAL>;
break;
#endif
#if OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
case SPINEL_PROP_MESHCOP_COMMISSIONER_STATE:
handler = &NcpBase::HandlePropertySet<SPINEL_PROP_MESHCOP_COMMISSIONER_STATE>;
break;
@@ -1068,7 +1068,7 @@ NcpBase::PropertyHandler NcpBase::FindInsertPropertyHandler(spinel_prop_key_t aK
// FTD Only Properties (Insert Handler)
#if OPENTHREAD_FTD
#if OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
case SPINEL_PROP_MESHCOP_COMMISSIONER_JOINERS:
handler = &NcpBase::HandlePropertyInsert<SPINEL_PROP_MESHCOP_COMMISSIONER_JOINERS>;
break;
@@ -1156,7 +1156,7 @@ NcpBase::PropertyHandler NcpBase::FindRemovePropertyHandler(spinel_prop_key_t aK
case SPINEL_PROP_THREAD_ACTIVE_ROUTER_IDS:
handler = &NcpBase::HandlePropertyRemove<SPINEL_PROP_THREAD_ACTIVE_ROUTER_IDS>;
break;
#if OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
case SPINEL_PROP_MESHCOP_COMMISSIONER_JOINERS:
handler = &NcpBase::HandlePropertyRemove<SPINEL_PROP_MESHCOP_COMMISSIONER_JOINERS>;
break;
src/ncp/ncp_base_ftd.cpp
+3 -3
View File
@@ -50,7 +50,7 @@
#include "common/code_utils.hpp"
#include "common/debug.hpp"
#include "common/instance.hpp"
#if OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
#include "meshcop/commissioner.hpp"
#endif
@@ -471,7 +471,7 @@ template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_THREAD_NEW_DATASET>(v
return error;
}
#if OPENTHREAD_ENABLE_COMMISSIONER
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
template <> otError NcpBase::HandlePropertyGet<SPINEL_PROP_MESHCOP_COMMISSIONER_STATE>(void)
{
@@ -805,7 +805,7 @@ template <> otError NcpBase::HandlePropertyInsert<SPINEL_PROP_THREAD_JOINERS>(vo
exit:
return error;
}
#endif // OPENTHREAD_ENABLE_COMMISSIONER
#endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
template <> otError NcpBase::HandlePropertySet<SPINEL_PROP_THREAD_LOCAL_LEADER_WEIGHT>(void)
{
tests/toranj/build.sh
-1
View File
@@ -77,7 +77,6 @@ build_config=$1
configure_options=" \
--disable-docs \
--disable-tests \
--enable-commissioner \
--enable-coverage=$coverage \
--enable-diag \
--enable-ftd \
tests/toranj/openthread-core-toranj-config.h
+8
View File
@@ -56,6 +56,14 @@
*/
#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1
/**
* @def OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
*
* Define to 1 to enable Commissioner support.
*
*/
#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 1
/**
* @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS
*
tests/unit/Makefile.am
+1 -6
View File
@@ -116,6 +116,7 @@ check_PROGRAMS += \
test-message-queue \
test-network-data \
test-priority-queue \
test-pskc \
test-string \
test-strlcat \
test-strlcpy \
@@ -123,12 +124,6 @@ check_PROGRAMS += \
test-timer \
$(NULL)
if OPENTHREAD_ENABLE_COMMISSIONER
check_PROGRAMS += \
test-pskc \
$(NULL)
endif
if OPENTHREAD_ENABLE_NCP
check_PROGRAMS += \
test-ncp-buffer \
tests/unit/test_pskc.cpp
+14
View File
@@ -34,6 +34,8 @@
#include "test_platform.h"
#include "test_util.h"
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
static const otExtendedPanId sXPanId = {{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}};
void TestMinimumPassphrase(void)
@@ -87,3 +89,15 @@ int main(void)
return 0;
}
#endif
#else // #if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
#ifdef ENABLE_TEST_MAIN
int main(void)
{
printf("Commissioenr role disabled\n");
return 0;
}
#endif
#endif // #if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h
Vendored
+1 -1
View File
@@ -60,7 +60,7 @@
* used by Header IE related features.
*
*/
#if OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_JOINER || OPENTHREAD_CONFIG_HEADER_IE_SUPPORT
#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE || OPENTHREAD_ENABLE_JOINER || OPENTHREAD_CONFIG_HEADER_IE_SUPPORT
#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 1
#else
#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 0
third_party/mbedtls/mbedtls-config.h
Vendored
+2 -1
View File
@@ -76,7 +76,8 @@
#define MBEDTLS_SSL_PROTO_DTLS
#define MBEDTLS_SSL_TLS_C
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || OPENTHREAD_CONFIG_COMMISSIONER_ENABLE || \
OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
#define MBEDTLS_SSL_COOKIE_C
#define MBEDTLS_SSL_SRV_C
#endif