diff --git a/.travis/script.sh b/.travis/script.sh index 6b7e2f2c2..dc77d0512 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -55,11 +55,13 @@ python --version || die export CPPFLAGS="${CPPFLAGS} -DMBEDTLS_CONFIG_FILE=\\\"mbedtls-config.h\\\"" # UART transport + export CPPFLAGS="${CPPFLAGS} \ + -DOPENTHREAD_CONFIG_BORDER_AGENT_ENABLE=1 \ + -DOPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE=1" + scan-build ./configure \ --enable-application-coap \ --enable-application-coap-secure \ - --enable-border-agent \ - --enable-border-router \ --enable-builtin-mbedtls=no \ --enable-cert-log \ --enable-channel-manager \ @@ -95,8 +97,6 @@ python --version || die scan-build ./configure \ --enable-application-coap \ --enable-application-coap-secure \ - --enable-border-agent \ - --enable-border-router \ --enable-builtin-mbedtls=no \ --enable-cert-log \ --enable-channel-manager \ @@ -362,6 +362,9 @@ build_samr21() { ./bootstrap || die CPPFLAGS=-DOPENTHREAD_CONFIG_LOG_LEVEL=OT_LOG_LEVEL_DEBG make -f examples/Makefile-posix || die + export CPPFLAGS=" \ + -DOPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE=1" + git checkout -- . || die git clean -xfd || die ./bootstrap || die @@ -371,7 +374,6 @@ build_samr21() { --enable-mtd \ --with-ncp-bus=spi \ --with-examples=posix \ - --enable-border-router \ --enable-child-supervision \ --enable-diag \ --enable-jam-detection \ @@ -393,7 +395,6 @@ build_samr21() { --enable-mtd \ --with-ncp-bus=spi \ --with-examples=posix \ - --enable-border-router \ --enable-child-supervision \ --enable-legacy \ --enable-mac-filter \ diff --git a/Makefile.am b/Makefile.am index 840eba40a..3700e4096 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-address-sanitizer \ --enable-application-coap \ --enable-application-coap-secure \ - --enable-border-router \ --enable-cert-log \ --enable-cli \ --enable-commissioner \ diff --git a/configure.ac b/configure.ac index 581fa4dad..e0e5ae859 100644 --- a/configure.ac +++ b/configure.ac @@ -807,38 +807,6 @@ AC_SUBST(OPENTHREAD_ENABLE_UDP_FORWARD) AM_CONDITIONAL([OPENTHREAD_ENABLE_UDP_FORWARD], [test "${enable_udp_forward}" = "yes"]) AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_UDP_FORWARD], [${OPENTHREAD_ENABLE_UDP_FORWARD}], [Define to 1 to enable the UDP forward feature.]) -# -# Thread Border Agent -# - -AC_MSG_CHECKING([whether to enable border agent]) -AC_ARG_ENABLE(border_agent, - [AS_HELP_STRING([--enable-border-agent], [Enable border agent support @<:@default=no@:>@.])], - [ - case "${enableval}" in - - no|yes) - enable_border_agent=${enableval} - ;; - - *) - AC_MSG_ERROR([Invalid value ${enable_border_agent} for --enable-border-agent]) - ;; - esac - ], - [enable_border_agent=no]) - -if test "${enable_border_agent}" = "yes"; then - OPENTHREAD_ENABLE_BORDER_AGENT=1 -else - OPENTHREAD_ENABLE_BORDER_AGENT=0 -fi - -AC_MSG_RESULT(${enable_border_agent}) -AC_SUBST(OPENTHREAD_ENABLE_BORDER_AGENT) -AM_CONDITIONAL([OPENTHREAD_ENABLE_BORDER_AGENT], [test "${enable_border_agent}" = "yes"]) -AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_BORDER_AGENT], [${OPENTHREAD_ENABLE_BORDER_AGENT}], [Define to 1 to enable the border agent feature.]) - # # Thread Network Diagnostic for MTD # @@ -1513,36 +1481,6 @@ AC_SUBST(OPENTHREAD_ENABLE_RAW_LINK_API) AM_CONDITIONAL([OPENTHREAD_ENABLE_RAW_LINK_API], [test "${enable_raw_link_api}" = "yes"]) AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_RAW_LINK_API],[${OPENTHREAD_ENABLE_RAW_LINK_API}],[Define to 1 if you want to enable raw link-layer API]) -# -# Border Router -# - -AC_ARG_ENABLE(border_router, - [AS_HELP_STRING([--enable-border-router],[Enable Border Router support @<:@default=no@:>@.])], - [ - case "${enableval}" in - - no|yes) - enable_border_router=${enableval} - ;; - - *) - AC_MSG_ERROR([Invalid value ${enable_border_router} for --enable-border-router]) - ;; - esac - ], - [enable_border_router=no]) - -if test "$enable_border_router" = "yes"; then - OPENTHREAD_ENABLE_BORDER_ROUTER=1 -else - OPENTHREAD_ENABLE_BORDER_ROUTER=0 -fi - -AC_SUBST(OPENTHREAD_ENABLE_BORDER_ROUTER) -AM_CONDITIONAL([OPENTHREAD_ENABLE_BORDER_ROUTER], [test "${enable_border_router}" = "yes"]) -AC_DEFINE_UNQUOTED([OPENTHREAD_ENABLE_BORDER_ROUTER],[${OPENTHREAD_ENABLE_BORDER_ROUTER}],[Define to 1 if you want to enable Border Router]) - # # Service # @@ -2048,8 +1986,6 @@ AC_MSG_NOTICE([ OpenThread Application CoAP support : ${enable_application_coap} OpenThread Application CoAP Secure support: ${enable_application_coap_secure} OpenThread Raw Link-Layer support : ${enable_raw_link_api} - OpenThread Border Agent support : ${enable_border_agent} - OpenThread Border Router support : ${enable_border_router} OpenThread Service support : ${enable_service} OpenThread ECDSA support : ${enable_ecdsa} OpenThread Examples : ${with_examples} diff --git a/examples/common-switches.mk b/examples/common-switches.mk index d7b75ac89..f2fdbf906 100644 --- a/examples/common-switches.mk +++ b/examples/common-switches.mk @@ -67,11 +67,11 @@ COMMONCFLAGS += -DBYTE_ORDER_BIG_ENDIAN=1 endif ifeq ($(BORDER_AGENT),1) -configure_OPTIONS += --enable-border-agent +COMMONCFLAGS += -DOPENTHREAD_CONFIG_BORDER_AGENT_ENABLE=1 endif ifeq ($(BORDER_ROUTER),1) -configure_OPTIONS += --enable-border-router +COMMONCFLAGS += -DOPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE=1 endif ifeq ($(COAP),1) diff --git a/include/openthread-config-android.h b/include/openthread-config-android.h index c0a093ef3..deb8e5609 100644 --- a/include/openthread-config-android.h +++ b/include/openthread-config-android.h @@ -27,10 +27,10 @@ */ /* Define to 1 to enable the border agent feature. */ -#define OPENTHREAD_ENABLE_BORDER_AGENT 1 +#define OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE 1 /* Define to 1 if you want to enable Border Router */ -#define OPENTHREAD_ENABLE_BORDER_ROUTER 1 +#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1 /* Define to 1 if you want to enable channel manager feature */ #define OPENTHREAD_ENABLE_CHANNEL_MANAGER 0 diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index ff9453d9a..1a6525314 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -52,7 +52,7 @@ #include #endif -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE #include #endif #if OPENTHREAD_ENABLE_SERVICE @@ -160,7 +160,7 @@ const struct Command Interpreter::sCommands[] = { #if OPENTHREAD_FTD {"neighbor", &Interpreter::ProcessNeighbor}, #endif -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE {"netdataregister", &Interpreter::ProcessNetworkDataRegister}, #endif #if OPENTHREAD_ENABLE_SERVICE @@ -184,7 +184,7 @@ const struct Command Interpreter::sCommands[] = { {"ping", &Interpreter::ProcessPing}, {"pollperiod", &Interpreter::ProcessPollPeriod}, {"promiscuous", &Interpreter::ProcessPromiscuous}, -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE {"prefix", &Interpreter::ProcessPrefix}, #endif #if OPENTHREAD_FTD @@ -193,7 +193,7 @@ const struct Command Interpreter::sCommands[] = { #endif {"reset", &Interpreter::ProcessReset}, {"rloc16", &Interpreter::ProcessRloc16}, -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE {"route", &Interpreter::ProcessRoute}, #endif #if OPENTHREAD_FTD @@ -1699,14 +1699,14 @@ exit: } #endif -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE void Interpreter::ProcessNetworkDataRegister(int argc, char *argv[]) { OT_UNUSED_VARIABLE(argc); OT_UNUSED_VARIABLE(argv); otError error = OT_ERROR_NONE; -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE SuccessOrExit(error = otBorderRouterRegister(mInstance)); #else SuccessOrExit(error = otServerRegister(mInstance)); @@ -1715,7 +1715,7 @@ void Interpreter::ProcessNetworkDataRegister(int argc, char *argv[]) exit: AppendResult(error); } -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE #if OPENTHREAD_FTD void Interpreter::ProcessNetworkIdTimeout(int argc, char *argv[]) @@ -2138,7 +2138,7 @@ void Interpreter::HandleLinkPcapReceive(const otRadioFrame *aFrame, bool aIsTx) mServer->OutputFormat("\r\n"); } -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE otError Interpreter::ProcessPrefixAdd(int argc, char *argv[]) { otError error = OT_ERROR_NONE; @@ -2358,7 +2358,7 @@ void Interpreter::ProcessPrefix(int argc, char *argv[]) exit: AppendResult(error); } -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE #if OPENTHREAD_FTD void Interpreter::ProcessReleaseRouterId(int argc, char *argv[]) @@ -2393,7 +2393,7 @@ void Interpreter::ProcessRloc16(int argc, char *argv[]) mServer->OutputFormat("Done\r\n"); } -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE otError Interpreter::ProcessRouteAdd(int argc, char *argv[]) { otError error = OT_ERROR_NONE; @@ -2549,7 +2549,7 @@ void Interpreter::ProcessRoute(int argc, char *argv[]) exit: AppendResult(error); } -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE #if OPENTHREAD_FTD void Interpreter::ProcessRouter(int argc, char *argv[]) diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp index c27f4183e..818ebfea3 100644 --- a/src/cli/cli.hpp +++ b/src/cli/cli.hpp @@ -261,7 +261,7 @@ private: #if OPENTHREAD_FTD void ProcessNeighbor(int argc, char *argv[]); #endif -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE void ProcessNetworkDataRegister(int argc, char *argv[]); #endif #if OPENTHREAD_ENABLE_SERVICE @@ -285,7 +285,7 @@ private: #endif void ProcessPing(int argc, char *argv[]); void ProcessPollPeriod(int argc, char *argv[]); -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE void ProcessPrefix(int argc, char *argv[]); otError ProcessPrefixAdd(int argc, char *argv[]); otError ProcessPrefixRemove(int argc, char *argv[]); @@ -297,7 +297,7 @@ private: void ProcessReleaseRouterId(int argc, char *argv[]); #endif void ProcessReset(int argc, char *argv[]); -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE void ProcessRoute(int argc, char *argv[]); otError ProcessRouteAdd(int argc, char *argv[]); otError ProcessRouteRemove(int argc, char *argv[]); diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 6561cda8e..c3cce7f80 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -319,6 +319,7 @@ HEADERS_COMMON = \ common/tlvs.hpp \ common/trickle_timer.hpp \ config/announce_sender.h \ + config/border_router.h \ config/openthread-core-config-check.h \ config/openthread-core-default-config.h \ crypto/aes_ccm.hpp \ diff --git a/src/core/api/border_agent_api.cpp b/src/core/api/border_agent_api.cpp index 641f4e883..7edce8416 100644 --- a/src/core/api/border_agent_api.cpp +++ b/src/core/api/border_agent_api.cpp @@ -38,7 +38,7 @@ #include "common/instance.hpp" #include "common/locator-getters.hpp" -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE using namespace ot; @@ -49,4 +49,4 @@ otBorderAgentState otBorderAgentGetState(otInstance *aInstance) return instance.Get().GetState(); } -#endif // OPENTHREAD_ENABLE_BORDER_AGENT +#endif // OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE diff --git a/src/core/api/border_router_api.cpp b/src/core/api/border_router_api.cpp index 90d0ac5d2..dd8dd2f98 100644 --- a/src/core/api/border_router_api.cpp +++ b/src/core/api/border_router_api.cpp @@ -33,7 +33,7 @@ #include "openthread-core-config.h" -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE #include @@ -153,4 +153,4 @@ otError otBorderRouterRegister(otInstance *aInstance) return instance.Get().SendServerDataNotification(); } -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE diff --git a/src/core/api/commissioner_api.cpp b/src/core/api/commissioner_api.cpp index 487fb719f..2fd5965b0 100644 --- a/src/core/api/commissioner_api.cpp +++ b/src/core/api/commissioner_api.cpp @@ -50,7 +50,7 @@ otError otCommissionerStart(otInstance * aInstance, #if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER Instance &instance = *static_cast(aInstance); -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE SuccessOrExit(error = instance.Get().Stop()); #endif SuccessOrExit(error = @@ -76,7 +76,7 @@ otError otCommissionerStop(otInstance *aInstance) Instance &instance = *static_cast(aInstance); SuccessOrExit(error = instance.Get().Stop()); -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE SuccessOrExit(error = instance.Get().Start()); #endif exit: diff --git a/src/core/common/instance.hpp b/src/core/common/instance.hpp index 6f9ffc00c..89e2f0f0c 100644 --- a/src/core/common/instance.hpp +++ b/src/core/common/instance.hpp @@ -514,7 +514,7 @@ template <> inline PanIdQueryServer &Instance::Get(void) return mThreadNetif.mPanIdQuery; } -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE template <> inline NetworkData::Local &Instance::Get(void) { return mThreadNetif.mNetworkDataLocal; @@ -657,7 +657,7 @@ template <> inline Utils::ChannelManager &Instance::Get(void) } #endif -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE template <> inline MeshCoP::BorderAgent &Instance::Get(void) { return mThreadNetif.mBorderAgent; diff --git a/src/core/config/border_router.h b/src/core/config/border_router.h new file mode 100644 index 000000000..2284367f7 --- /dev/null +++ b/src/core/config/border_router.h @@ -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 Border Router services. + * + */ + +#ifndef CONFIG_BORDER_ROUTER_H_ +#define CONFIG_BORDER_ROUTER_H_ + +/** + * @def OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE + * + * Define to 1 to enable Border Agent support. + * + */ +#ifndef OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE +#define OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE 0 +#endif + +/** + * @def OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE + * + * Define to 1 to enable Border Router support. + * + */ +#ifndef OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE +#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0 +#endif + +#endif // CONFIG_BORDER_ROUTER_H_ diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp index 77281d506..6bee30f66 100644 --- a/src/core/meshcop/border_agent.cpp +++ b/src/core/meshcop/border_agent.cpp @@ -44,7 +44,7 @@ #include "thread/thread_tlvs.hpp" #include "thread/thread_uri_paths.hpp" -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE namespace ot { namespace MeshCoP { @@ -727,4 +727,4 @@ void BorderAgent::SetState(otBorderAgentState aState) } // namespace MeshCoP } // namespace ot -#endif // OPENTHREAD_ENABLE_BORDER_AGENT +#endif // OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE diff --git a/src/core/openthread-core-config.h b/src/core/openthread-core-config.h index 981040d02..d0242f035 100644 --- a/src/core/openthread-core-config.h +++ b/src/core/openthread-core-config.h @@ -45,9 +45,10 @@ #include "config/openthread-core-default-config.h" #include "config/announce_sender.h" +#include "config/border_router.h" -#if OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE || OPENTHREAD_ENABLE_BORDER_AGENT || OPENTHREAD_ENABLE_COMMISSIONER || \ - OPENTHREAD_ENABLE_JOINER +#if OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE || OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || \ + OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_JOINER #define OPENTHREAD_CONFIG_DTLS_ENABLE 1 #endif diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 5a5ed5ec8..35e98f5ec 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -329,7 +329,7 @@ void Mle::SetRole(otDeviceRole aRole) break; } -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE if (IsAttached()) { SuccessOrExit(Get().Start()); @@ -760,7 +760,7 @@ void Mle::SetStateChild(uint16_t aRloc16) Get().HandleChildStart(mParentRequestMode); } -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE Get().ClearResubmitDelayTimer(); #endif Get().SetForwardingEnabled(false); @@ -1548,7 +1548,7 @@ void Mle::HandleStateChanged(otChangedFlags aFlags) ScheduleMessageTransmissionTimer(); } -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE Get().SendServerDataNotification(); #if OPENTHREAD_ENABLE_SERVICE this->UpdateServiceAlocs(); diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index d9b1cbe8f..8207e723f 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -1405,7 +1405,7 @@ otError MleRouter::HandleAdvertisement(const Message &aMessage, const Ip6::Messa UpdateRoutes(route, routerId); -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE Get().SendServerDataNotification(); #endif diff --git a/src/core/thread/network_data_local.cpp b/src/core/thread/network_data_local.cpp index dda16e48f..87472fdfb 100644 --- a/src/core/thread/network_data_local.cpp +++ b/src/core/thread/network_data_local.cpp @@ -41,7 +41,7 @@ #include "mac/mac_frame.hpp" #include "thread/thread_netif.hpp" -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE namespace ot { namespace NetworkData { @@ -387,4 +387,4 @@ exit: } // namespace NetworkData } // namespace ot -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp index 7092143cc..6dc4988a4 100644 --- a/src/core/thread/thread_netif.cpp +++ b/src/core/thread/thread_netif.cpp @@ -72,7 +72,7 @@ ThreadNetif::ThreadNetif(Instance &aInstance) , mMac(aInstance) , mMeshForwarder(aInstance) , mMleRouter(aInstance) -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE , mNetworkDataLocal(aInstance) #endif , mNetworkDataLeader(aInstance) @@ -80,7 +80,7 @@ ThreadNetif::ThreadNetif(Instance &aInstance) , mNetworkDiagnostic(aInstance) #endif , mIsUp(false) -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE , mBorderAgent(aInstance) #endif #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp index 48fe47cbe..f11413d77 100644 --- a/src/core/thread/thread_netif.hpp +++ b/src/core/thread/thread_netif.hpp @@ -40,7 +40,7 @@ #include "coap/coap_secure.hpp" #include "mac/mac.hpp" -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE #include "meshcop/border_agent.hpp" #endif #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD @@ -187,16 +187,16 @@ private: Mac::Mac mMac; MeshForwarder mMeshForwarder; Mle::MleRouter mMleRouter; -#if OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE NetworkData::Local mNetworkDataLocal; -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER || OPENTHREAD_ENABLE_SERVICE +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_ENABLE_SERVICE NetworkData::Leader mNetworkDataLeader; #if OPENTHREAD_FTD || OPENTHREAD_ENABLE_MTD_NETWORK_DIAGNOSTIC NetworkDiagnostic::NetworkDiagnostic mNetworkDiagnostic; #endif // OPENTHREAD_FTD || OPENTHREAD_ENABLE_MTD_NETWORK_DIAGNOSTIC bool mIsUp; -#if OPENTHREAD_ENABLE_BORDER_AGENT +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE MeshCoP::BorderAgent mBorderAgent; #endif #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp index ccf4982c9..b766ef149 100644 --- a/src/ncp/ncp_base.cpp +++ b/src/ncp/ncp_base.cpp @@ -1815,7 +1815,7 @@ template <> otError NcpBase::HandlePropertyGet(void) SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_THREAD_JOINER)); #endif -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE SuccessOrExit(error = mEncoder.WriteUintPacked(SPINEL_CAP_THREAD_BORDER_ROUTER)); #endif diff --git a/src/ncp/ncp_base_dispatcher.cpp b/src/ncp/ncp_base_dispatcher.cpp index 27b7dc9ed..f27221bd2 100644 --- a/src/ncp/ncp_base_dispatcher.cpp +++ b/src/ncp/ncp_base_dispatcher.cpp @@ -275,7 +275,7 @@ NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey) case SPINEL_PROP_THREAD_STABLE_NETWORK_DATA_VERSION: handler = &NcpBase::HandlePropertyGet; break; -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE case SPINEL_PROP_THREAD_NETWORK_DATA: handler = &NcpBase::HandlePropertyGet; break; @@ -812,7 +812,7 @@ NcpBase::PropertyHandler NcpBase::FindSetPropertyHandler(spinel_prop_key_t aKey) case SPINEL_PROP_THREAD_DISCOVERY_SCAN_PANID: handler = &NcpBase::HandlePropertySet; break; -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE case SPINEL_PROP_THREAD_ALLOW_LOCAL_NET_DATA_CHANGE: handler = &NcpBase::HandlePropertySet; break; @@ -1038,7 +1038,7 @@ NcpBase::PropertyHandler NcpBase::FindInsertPropertyHandler(spinel_prop_key_t aK case SPINEL_PROP_THREAD_ASSISTING_PORTS: handler = &NcpBase::HandlePropertyInsert; break; -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE case SPINEL_PROP_THREAD_OFF_MESH_ROUTES: handler = &NcpBase::HandlePropertyInsert; break; @@ -1120,7 +1120,7 @@ NcpBase::PropertyHandler NcpBase::FindRemovePropertyHandler(spinel_prop_key_t aK case SPINEL_PROP_IPV6_MULTICAST_ADDRESS_TABLE: handler = &NcpBase::HandlePropertyRemove; break; -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE case SPINEL_PROP_THREAD_OFF_MESH_ROUTES: handler = &NcpBase::HandlePropertyRemove; break; diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index 20f07b231..c2f8782dd 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -34,7 +34,7 @@ #include "ncp_base.hpp" -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE #include #endif #if OPENTHREAD_ENABLE_CHANNEL_MONITOR @@ -485,7 +485,7 @@ template <> otError NcpBase::HandlePropertyGet otError NcpBase::HandlePropertyGet(void) { uint8_t networkData[255]; @@ -509,7 +509,7 @@ template <> otError NcpBase::HandlePropertyGet otError NcpBase::HandlePropertyGet(void) { @@ -692,7 +692,7 @@ template <> otError NcpBase::HandlePropertyGet otError NcpBase::HandlePropertySet(void) { bool value = false; @@ -715,7 +715,7 @@ exit: return error; } -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE template <> otError NcpBase::HandlePropertyGet(void) { @@ -738,7 +738,7 @@ template <> otError NcpBase::HandlePropertyGet( SuccessOrExit(error = mEncoder.CloseStruct()); } -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE iter = OT_NETWORK_DATA_ITERATOR_INIT; @@ -756,13 +756,13 @@ template <> otError NcpBase::HandlePropertyGet( SuccessOrExit(error = mEncoder.CloseStruct()); } -#endif // OPENTHREAD_ENABLE_BORDER_ROUTER +#endif // OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE exit: return error; } -#if OPENTHREAD_ENABLE_BORDER_ROUTER +#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE template <> otError NcpBase::HandlePropertyInsert(void) { otError error = OT_ERROR_NONE; @@ -824,7 +824,7 @@ template <> otError NcpBase::HandlePropertyRemove otError NcpBase::HandlePropertyGet otError NcpBase::HandlePropertyGet otError NcpBase::HandlePropertyRemove otError NcpBase::HandlePropertySet(void) { diff --git a/tests/toranj/build.sh b/tests/toranj/build.sh index b3a54ff8c..dffa43fd5 100755 --- a/tests/toranj/build.sh +++ b/tests/toranj/build.sh @@ -77,7 +77,6 @@ build_config=$1 configure_options=" \ --disable-docs \ --disable-tests \ - --enable-border-router \ --enable-channel-manager \ --enable-channel-monitor \ --enable-child-supervision \ diff --git a/tests/toranj/openthread-core-toranj-config.h b/tests/toranj/openthread-core-toranj-config.h index 01d85272e..a6ebb9d03 100644 --- a/tests/toranj/openthread-core-toranj-config.h +++ b/tests/toranj/openthread-core-toranj-config.h @@ -48,6 +48,14 @@ #define OPENTHREAD_CONFIG_PLATFORM_INFO "POSIX-toranj" #endif +/** + * @def OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE + * + * Define to 1 to enable Border Router support. + * + */ +#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 1 + /** * @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS * diff --git a/third_party/mbedtls/mbedtls-config.h b/third_party/mbedtls/mbedtls-config.h index c58eef612..96c195ff9 100644 --- a/third_party/mbedtls/mbedtls-config.h +++ b/third_party/mbedtls/mbedtls-config.h @@ -76,7 +76,8 @@ #define MBEDTLS_SSL_PROTO_DTLS #define MBEDTLS_SSL_TLS_C -#if OPENTHREAD_ENABLE_BORDER_AGENT || OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE +#if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE || OPENTHREAD_ENABLE_COMMISSIONER || \ + OPENTHREAD_ENABLE_APPLICATION_COAP_SECURE #define MBEDTLS_SSL_COOKIE_C #define MBEDTLS_SSL_SRV_C #endif