From a0ff24d0aca5ab1df6ba2b0ba352ec0402be207b Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Mon, 22 May 2017 09:40:31 -0700 Subject: [PATCH] Use OT_URI_PATH_* names for paths. (#1767) --- etc/visual-studio/libopenthread.vcxproj | 2 +- .../libopenthread.vcxproj.filters | 2 +- etc/visual-studio/libopenthread_k.vcxproj | 2 +- .../libopenthread_k.vcxproj.filters | 2 +- src/core/Makefile.am | 2 +- src/core/meshcop/announce_begin_client.cpp | 4 +- src/core/meshcop/border_agent_proxy.cpp | 4 +- src/core/meshcop/commissioner.cpp | 18 +-- src/core/meshcop/dataset_manager.cpp | 14 +-- src/core/meshcop/dataset_manager_ftd.cpp | 6 +- src/core/meshcop/energy_scan_client.cpp | 6 +- src/core/meshcop/joiner.cpp | 6 +- src/core/meshcop/joiner_router.cpp | 8 +- src/core/meshcop/leader.cpp | 8 +- src/core/meshcop/panid_query_client.cpp | 6 +- src/core/thread/address_resolver.cpp | 14 +-- src/core/thread/announce_begin_server.cpp | 4 +- src/core/thread/energy_scan_server.cpp | 6 +- src/core/thread/mle_router.cpp | 10 +- src/core/thread/network_data.cpp | 4 +- src/core/thread/network_data_leader.cpp | 2 +- src/core/thread/network_data_leader_ftd.cpp | 8 +- src/core/thread/network_diagnostic.cpp | 18 +-- src/core/thread/panid_query_server.cpp | 6 +- src/core/thread/thread_netif.cpp | 2 +- .../{thread_uris.hpp => thread_uri_paths.hpp} | 110 +++++++++--------- 26 files changed, 137 insertions(+), 137 deletions(-) rename src/core/thread/{thread_uris.hpp => thread_uri_paths.hpp} (56%) diff --git a/etc/visual-studio/libopenthread.vcxproj b/etc/visual-studio/libopenthread.vcxproj index 46ddf244e..384ab96a6 100644 --- a/etc/visual-studio/libopenthread.vcxproj +++ b/etc/visual-studio/libopenthread.vcxproj @@ -217,7 +217,7 @@ - + diff --git a/etc/visual-studio/libopenthread.vcxproj.filters b/etc/visual-studio/libopenthread.vcxproj.filters index 2834e2da5..5ca9de7a8 100644 --- a/etc/visual-studio/libopenthread.vcxproj.filters +++ b/etc/visual-studio/libopenthread.vcxproj.filters @@ -473,7 +473,7 @@ Header Files\thread - + Header Files\thread diff --git a/etc/visual-studio/libopenthread_k.vcxproj b/etc/visual-studio/libopenthread_k.vcxproj index 4b957f91b..d92ffc00d 100644 --- a/etc/visual-studio/libopenthread_k.vcxproj +++ b/etc/visual-studio/libopenthread_k.vcxproj @@ -251,7 +251,7 @@ - + diff --git a/etc/visual-studio/libopenthread_k.vcxproj.filters b/etc/visual-studio/libopenthread_k.vcxproj.filters index 4184400bd..2ca92d6af 100644 --- a/etc/visual-studio/libopenthread_k.vcxproj.filters +++ b/etc/visual-studio/libopenthread_k.vcxproj.filters @@ -476,7 +476,7 @@ Header Files\thread - + Header Files\thread diff --git a/src/core/Makefile.am b/src/core/Makefile.am index e4e534305..92a56a8b7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -288,7 +288,7 @@ HEADERS_COMMON = \ thread/src_match_controller.hpp \ thread/thread_netif.hpp \ thread/thread_tlvs.hpp \ - thread/thread_uris.hpp \ + thread/thread_uri_paths.hpp \ thread/topology.hpp \ utils/child_supervision.hpp \ utils/slaac_address.hpp \ diff --git a/src/core/meshcop/announce_begin_client.cpp b/src/core/meshcop/announce_begin_client.cpp index 8614d370a..7d5c273fe 100644 --- a/src/core/meshcop/announce_begin_client.cpp +++ b/src/core/meshcop/announce_begin_client.cpp @@ -50,7 +50,7 @@ #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD @@ -84,7 +84,7 @@ ThreadError AnnounceBeginClient::SendRequest(uint32_t aChannelMask, uint8_t aCou header.Init(aAddress.IsMulticast() ? kCoapTypeNonConfirmable : kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_ANNOUNCE_BEGIN); + header.AppendUriPathOptions(OT_URI_PATH_ANNOUNCE_BEGIN); header.SetPayloadMarker(); VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, diff --git a/src/core/meshcop/border_agent_proxy.cpp b/src/core/meshcop/border_agent_proxy.cpp index c35f10f8a..ad5d0d7af 100644 --- a/src/core/meshcop/border_agent_proxy.cpp +++ b/src/core/meshcop/border_agent_proxy.cpp @@ -46,7 +46,7 @@ #include "coap/coap_header.hpp" #include "net/ip6_address.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #if OPENTHREAD_FTD && OPENTHREAD_ENABLE_BORDER_AGENT_PROXY @@ -54,7 +54,7 @@ namespace ot { namespace MeshCoP { BorderAgentProxy::BorderAgentProxy(const Ip6::Address &aMeshLocal16, Coap::Coap &aCoap): - mRelayReceive(OPENTHREAD_URI_RELAY_RX, &BorderAgentProxy::HandleRelayReceive, this), + mRelayReceive(OT_URI_PATH_RELAY_RX, &BorderAgentProxy::HandleRelayReceive, this), mStreamHandler(NULL), mContext(NULL), mMeshLocal16(aMeshLocal16), diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index 007100402..12bedbd94 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -56,7 +56,7 @@ #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #if OPENTHREAD_FTD && OPENTHREAD_ENABLE_COMMISSIONER @@ -76,9 +76,9 @@ Commissioner::Commissioner(ThreadNetif &aThreadNetif): mTimer(aThreadNetif.GetIp6().mTimerScheduler, HandleTimer, this), mSessionId(0), mTransmitAttempts(0), - mRelayReceive(OPENTHREAD_URI_RELAY_RX, &Commissioner::HandleRelayReceive, this), - mDatasetChanged(OPENTHREAD_URI_DATASET_CHANGED, &Commissioner::HandleDatasetChanged, this), - mJoinerFinalize(OPENTHREAD_URI_JOINER_FINALIZE, &Commissioner::HandleJoinerFinalize, this), + mRelayReceive(OT_URI_PATH_RELAY_RX, &Commissioner::HandleRelayReceive, this), + mDatasetChanged(OT_URI_PATH_DATASET_CHANGED, &Commissioner::HandleDatasetChanged, this), + mJoinerFinalize(OT_URI_PATH_JOINER_FINALIZE, &Commissioner::HandleJoinerFinalize, this), mNetif(aThreadNetif) { memset(mJoiners, 0, sizeof(mJoiners)); @@ -413,7 +413,7 @@ ThreadError Commissioner::SendMgmtCommissionerGetRequest(const uint8_t *aTlvs, header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_COMMISSIONER_GET); + header.AppendUriPathOptions(OT_URI_PATH_COMMISSIONER_GET); if (aLength > 0) { @@ -484,7 +484,7 @@ ThreadError Commissioner::SendMgmtCommissionerSetRequest(const otCommissioningDa header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_COMMISSIONER_SET); + header.AppendUriPathOptions(OT_URI_PATH_COMMISSIONER_SET); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); @@ -589,7 +589,7 @@ ThreadError Commissioner::SendPetition(void) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_LEADER_PETITION); + header.AppendUriPathOptions(OT_URI_PATH_LEADER_PETITION); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); @@ -689,7 +689,7 @@ ThreadError Commissioner::SendKeepAlive(void) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_LEADER_KEEP_ALIVE); + header.AppendUriPathOptions(OT_URI_PATH_LEADER_KEEP_ALIVE); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); @@ -993,7 +993,7 @@ ThreadError Commissioner::SendRelayTransmit(Message &aMessage, const Ip6::Messag otLogFuncEntry(); header.Init(kCoapTypeNonConfirmable, kCoapRequestPost); - header.AppendUriPathOptions(OPENTHREAD_URI_RELAY_TX); + header.AppendUriPathOptions(OT_URI_PATH_RELAY_TX); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 854390a3e..6eb8cc0d9 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -60,7 +60,7 @@ #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" namespace ot { namespace MeshCoP { @@ -311,7 +311,7 @@ ThreadError DatasetManager::Register(void) header.AppendUriPathOptions(mUriSet); header.SetPayloadMarker(); - if (strcmp(mUriSet, OPENTHREAD_URI_PENDING_SET) == 0) + if (strcmp(mUriSet, OT_URI_PATH_PENDING_SET) == 0) { PendingDatasetBase *pending = static_cast(this); pending->UpdateDelayTimer(); @@ -404,7 +404,7 @@ ThreadError DatasetManager::Set(Coap::Header &aHeader, Message &aMessage, const // verify that does not overflow dataset buffer VerifyOrExit((offset - aMessage.GetOffset()) <= Dataset::kMaxSize, state = StateTlv::kReject); - type = (strcmp(mUriSet, OPENTHREAD_URI_ACTIVE_SET) == 0 ? Tlv::kActiveTimestamp : Tlv::kPendingTimestamp); + type = (strcmp(mUriSet, OT_URI_PATH_ACTIVE_SET) == 0 ? Tlv::kActiveTimestamp : Tlv::kPendingTimestamp); if (Tlv::GetTlv(aMessage, Tlv::kActiveTimestamp, sizeof(activeTimestamp), activeTimestamp) != kThreadError_None) { @@ -897,8 +897,8 @@ exit: } ActiveDatasetBase::ActiveDatasetBase(ThreadNetif &aThreadNetif): - DatasetManager(aThreadNetif, Tlv::kActiveTimestamp, OPENTHREAD_URI_ACTIVE_SET, OPENTHREAD_URI_ACTIVE_GET), - mResourceGet(OPENTHREAD_URI_ACTIVE_GET, &ActiveDatasetBase::HandleGet, this) + DatasetManager(aThreadNetif, Tlv::kActiveTimestamp, OT_URI_PATH_ACTIVE_SET, OT_URI_PATH_ACTIVE_GET), + mResourceGet(OT_URI_PATH_ACTIVE_GET, &ActiveDatasetBase::HandleGet, this) { mNetif.GetCoap().AddResource(mResourceGet); } @@ -983,11 +983,11 @@ void ActiveDatasetBase::HandleGet(Coap::Header &aHeader, Message &aMessage, cons } PendingDatasetBase::PendingDatasetBase(ThreadNetif &aThreadNetif): - DatasetManager(aThreadNetif, Tlv::kPendingTimestamp, OPENTHREAD_URI_PENDING_SET, OPENTHREAD_URI_PENDING_GET), + DatasetManager(aThreadNetif, Tlv::kPendingTimestamp, OT_URI_PATH_PENDING_SET, OT_URI_PATH_PENDING_GET), mTimer(aThreadNetif.GetIp6().mTimerScheduler, &PendingDatasetBase::HandleTimer, this), mLocalTime(0), mNetworkTime(0), - mResourceGet(OPENTHREAD_URI_PENDING_GET, &PendingDatasetBase::HandleGet, this) + mResourceGet(OT_URI_PATH_PENDING_GET, &PendingDatasetBase::HandleGet, this) { mNetif.GetCoap().AddResource(mResourceGet); } diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp index f8ab04413..26fd61d9c 100644 --- a/src/core/meshcop/dataset_manager_ftd.cpp +++ b/src/core/meshcop/dataset_manager_ftd.cpp @@ -60,14 +60,14 @@ #include "meshcop/leader.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" namespace ot { namespace MeshCoP { ActiveDataset::ActiveDataset(ThreadNetif &aThreadNetif): ActiveDatasetBase(aThreadNetif), - mResourceSet(OPENTHREAD_URI_ACTIVE_SET, &ActiveDataset::HandleSet, this) + mResourceSet(OT_URI_PATH_ACTIVE_SET, &ActiveDataset::HandleSet, this) { } @@ -215,7 +215,7 @@ exit: PendingDataset::PendingDataset(ThreadNetif &aThreadNetif): PendingDatasetBase(aThreadNetif), - mResourceSet(OPENTHREAD_URI_PENDING_SET, &PendingDataset::HandleSet, this) + mResourceSet(OT_URI_PATH_PENDING_SET, &PendingDataset::HandleSet, this) { } diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp index 2f44ede44..b61ef78da 100644 --- a/src/core/meshcop/energy_scan_client.cpp +++ b/src/core/meshcop/energy_scan_client.cpp @@ -51,7 +51,7 @@ #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD @@ -61,7 +61,7 @@ using ot::Encoding::BigEndian::HostSwap32; namespace ot { EnergyScanClient::EnergyScanClient(ThreadNetif &aThreadNetif) : - mEnergyScan(OPENTHREAD_URI_ENERGY_REPORT, &EnergyScanClient::HandleReport, this), + mEnergyScan(OT_URI_PATH_ENERGY_REPORT, &EnergyScanClient::HandleReport, this), mNetif(aThreadNetif) { mContext = NULL; @@ -93,7 +93,7 @@ ThreadError EnergyScanClient::SendQuery(uint32_t aChannelMask, uint8_t aCount, u header.Init(aAddress.IsMulticast() ? kCoapTypeNonConfirmable : kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_ENERGY_SCAN); + header.AppendUriPathOptions(OT_URI_PATH_ENERGY_SCAN); header.SetPayloadMarker(); VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index f9f52532f..a849e113e 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -54,7 +54,7 @@ #include "mac/mac_frame.hpp" #include "meshcop/meshcop.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #if OPENTHREAD_ENABLE_JOINER @@ -78,7 +78,7 @@ Joiner::Joiner(ThreadNetif &aNetif): mVendorSwVersion(NULL), mVendorData(NULL), mTimer(aNetif.GetIp6().mTimerScheduler, &Joiner::HandleTimer, this), - mJoinerEntrust(OPENTHREAD_URI_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this), + mJoinerEntrust(OT_URI_PATH_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this), mNetif(aNetif) { mNetif.GetCoap().AddResource(mJoinerEntrust); @@ -284,7 +284,7 @@ void Joiner::SendJoinerFinalize(void) otLogFuncEntry(); header.Init(kCoapTypeConfirmable, kCoapRequestPost); - header.AppendUriPathOptions(OPENTHREAD_URI_JOINER_FINALIZE); + header.AppendUriPathOptions(OT_URI_PATH_JOINER_FINALIZE); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoapSecure(), header)) != NULL, diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp index 9a1149542..3b9ad1bd2 100644 --- a/src/core/meshcop/joiner_router.cpp +++ b/src/core/meshcop/joiner_router.cpp @@ -52,7 +52,7 @@ #include "meshcop/meshcop_tlvs.hpp" #include "thread/mle.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap16; using ot::Encoding::BigEndian::HostSwap64; @@ -62,7 +62,7 @@ namespace MeshCoP { JoinerRouter::JoinerRouter(ThreadNetif &aNetif): mSocket(aNetif.GetIp6().mUdp), - mRelayTransmit(OPENTHREAD_URI_RELAY_TX, &JoinerRouter::HandleRelayTransmit, this), + mRelayTransmit(OT_URI_PATH_RELAY_TX, &JoinerRouter::HandleRelayTransmit, this), mNetif(aNetif), mTimer(aNetif.GetIp6().mTimerScheduler, &JoinerRouter::HandleTimer, this), mJoinerUdpPort(0), @@ -180,7 +180,7 @@ void JoinerRouter::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &a header.Init(kCoapTypeNonConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_RELAY_RX); + header.AppendUriPathOptions(OT_URI_PATH_RELAY_RX); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); @@ -338,7 +338,7 @@ ThreadError JoinerRouter::DelaySendingJoinerEntrust(const Ip6::MessageInfo &aMes otLogFuncEntry(); header.Init(kCoapTypeConfirmable, kCoapRequestPost); - header.AppendUriPathOptions(OPENTHREAD_URI_JOINER_ENTRUST); + header.AppendUriPathOptions(OT_URI_PATH_JOINER_ENTRUST); header.SetPayloadMarker(); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); diff --git a/src/core/meshcop/leader.cpp b/src/core/meshcop/leader.cpp index a7d60509a..a74aa36bd 100644 --- a/src/core/meshcop/leader.cpp +++ b/src/core/meshcop/leader.cpp @@ -54,14 +54,14 @@ #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" namespace ot { namespace MeshCoP { Leader::Leader(ThreadNetif &aThreadNetif): - mPetition(OPENTHREAD_URI_LEADER_PETITION, Leader::HandlePetition, this), - mKeepAlive(OPENTHREAD_URI_LEADER_KEEP_ALIVE, Leader::HandleKeepAlive, this), + mPetition(OT_URI_PATH_LEADER_PETITION, Leader::HandlePetition, this), + mKeepAlive(OT_URI_PATH_LEADER_KEEP_ALIVE, Leader::HandleKeepAlive, this), mTimer(aThreadNetif.GetIp6().mTimerScheduler, HandleTimer, this), mDelayTimerMinimal(DelayTimerTlv::kDelayTimerMinimal), mSessionId(0xffff), @@ -249,7 +249,7 @@ ThreadError Leader::SendDatasetChanged(const Ip6::Address &aAddress) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_DATASET_CHANGED); + header.AppendUriPathOptions(OT_URI_PATH_DATASET_CHANGED); VerifyOrExit((message = NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, error = kThreadError_NoBufs); diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp index b3b671b3d..553c3c230 100644 --- a/src/core/meshcop/panid_query_client.cpp +++ b/src/core/meshcop/panid_query_client.cpp @@ -50,7 +50,7 @@ #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #if OPENTHREAD_ENABLE_COMMISSIONER && OPENTHREAD_FTD @@ -59,7 +59,7 @@ namespace ot { PanIdQueryClient::PanIdQueryClient(ThreadNetif &aThreadNetif) : mCallback(NULL), mContext(NULL), - mPanIdQuery(OPENTHREAD_URI_PANID_CONFLICT, &PanIdQueryClient::HandleConflict, this), + mPanIdQuery(OT_URI_PATH_PANID_CONFLICT, &PanIdQueryClient::HandleConflict, this), mNetif(aThreadNetif) { mNetif.GetCoap().AddResource(mPanIdQuery); @@ -86,7 +86,7 @@ ThreadError PanIdQueryClient::SendQuery(uint16_t aPanId, uint32_t aChannelMask, header.Init(aAddress.IsMulticast() ? kCoapTypeNonConfirmable : kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_PANID_QUERY); + header.AppendUriPathOptions(OT_URI_PATH_PANID_QUERY); header.SetPayloadMarker(); VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index a782a95c1..695276f84 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -55,16 +55,16 @@ #include "thread/mle_router.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap16; namespace ot { AddressResolver::AddressResolver(ThreadNetif &aThreadNetif) : - mAddressError(OPENTHREAD_URI_ADDRESS_ERROR, &AddressResolver::HandleAddressError, this), - mAddressQuery(OPENTHREAD_URI_ADDRESS_QUERY, &AddressResolver::HandleAddressQuery, this), - mAddressNotification(OPENTHREAD_URI_ADDRESS_NOTIFY, &AddressResolver::HandleAddressNotification, this), + mAddressError(OT_URI_PATH_ADDRESS_ERROR, &AddressResolver::HandleAddressError, this), + mAddressQuery(OT_URI_PATH_ADDRESS_QUERY, &AddressResolver::HandleAddressQuery, this), + mAddressNotification(OT_URI_PATH_ADDRESS_NOTIFY, &AddressResolver::HandleAddressNotification, this), mIcmpHandler(&AddressResolver::HandleIcmpReceive, this), mTimer(aThreadNetif.GetIp6().mTimerScheduler, &AddressResolver::HandleTimer, this), mNetif(aThreadNetif) @@ -244,7 +244,7 @@ ThreadError AddressResolver::SendAddressQuery(const Ip6::Address &aEid) Ip6::MessageInfo messageInfo; header.Init(kCoapTypeNonConfirmable, kCoapRequestPost); - header.AppendUriPathOptions(OPENTHREAD_URI_ADDRESS_QUERY); + header.AppendUriPathOptions(OT_URI_PATH_ADDRESS_QUERY); header.SetPayloadMarker(); VerifyOrExit((message = mNetif.GetCoap().NewMessage(header)) != NULL, error = kThreadError_NoBufs); @@ -379,7 +379,7 @@ ThreadError AddressResolver::SendAddressError(const ThreadTargetTlv &aTarget, co header.Init(aDestination == NULL ? kCoapTypeNonConfirmable : kCoapTypeConfirmable, kCoapRequestPost); - header.AppendUriPathOptions(OPENTHREAD_URI_ADDRESS_ERROR); + header.AppendUriPathOptions(OT_URI_PATH_ADDRESS_ERROR); header.SetPayloadMarker(); VerifyOrExit((message = mNetif.GetCoap().NewMessage(header)) != NULL, error = kThreadError_NoBufs); @@ -575,7 +575,7 @@ void AddressResolver::SendAddressQueryResponse(const ThreadTargetTlv &aTargetTlv Ip6::MessageInfo messageInfo; header.Init(kCoapTypeConfirmable, kCoapRequestPost); - header.AppendUriPathOptions(OPENTHREAD_URI_ADDRESS_NOTIFY); + header.AppendUriPathOptions(OT_URI_PATH_ADDRESS_NOTIFY); header.SetPayloadMarker(); VerifyOrExit((message = mNetif.GetCoap().NewMessage(header)) != NULL, error = kThreadError_NoBufs); diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp index f0bf62c71..e6f4af981 100644 --- a/src/core/thread/announce_begin_server.cpp +++ b/src/core/thread/announce_begin_server.cpp @@ -49,7 +49,7 @@ #include "common/logging.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap32; @@ -61,7 +61,7 @@ AnnounceBeginServer::AnnounceBeginServer(ThreadNetif &aThreadNetif) : mCount(0), mChannel(0), mTimer(aThreadNetif.GetIp6().mTimerScheduler, &AnnounceBeginServer::HandleTimer, this), - mAnnounceBegin(OPENTHREAD_URI_ANNOUNCE_BEGIN, &AnnounceBeginServer::HandleRequest, this), + mAnnounceBegin(OT_URI_PATH_ANNOUNCE_BEGIN, &AnnounceBeginServer::HandleRequest, this), mNetif(aThreadNetif) { mNetif.GetCoap().AddResource(mAnnounceBegin); diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp index c51d7b326..84de0be9e 100644 --- a/src/core/thread/energy_scan_server.cpp +++ b/src/core/thread/energy_scan_server.cpp @@ -50,7 +50,7 @@ #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" namespace ot { @@ -63,7 +63,7 @@ EnergyScanServer::EnergyScanServer(ThreadNetif &aThreadNetif) : mActive(false), mScanResultsLength(0), mTimer(aThreadNetif.GetIp6().mTimerScheduler, &EnergyScanServer::HandleTimer, this), - mEnergyScan(OPENTHREAD_URI_ENERGY_SCAN, &EnergyScanServer::HandleRequest, this), + mEnergyScan(OT_URI_PATH_ENERGY_SCAN, &EnergyScanServer::HandleRequest, this), mNetif(aThreadNetif) { mNetifCallback.Set(&EnergyScanServer::HandleNetifStateChanged, this); @@ -201,7 +201,7 @@ ThreadError EnergyScanServer::SendReport(void) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_ENERGY_REPORT); + header.AppendUriPathOptions(OT_URI_PATH_ENERGY_REPORT); header.SetPayloadMarker(); VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 145bc7a9f..042b38350 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -54,7 +54,7 @@ #include "net/icmp6.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap16; @@ -65,8 +65,8 @@ MleRouter::MleRouter(ThreadNetif &aThreadNetif): Mle(aThreadNetif), mAdvertiseTimer(aThreadNetif.GetIp6().mTimerScheduler, &MleRouter::HandleAdvertiseTimer, NULL, this), mStateUpdateTimer(aThreadNetif.GetIp6().mTimerScheduler, &MleRouter::HandleStateUpdateTimer, this), - mAddressSolicit(OPENTHREAD_URI_ADDRESS_SOLICIT, &MleRouter::HandleAddressSolicit, this), - mAddressRelease(OPENTHREAD_URI_ADDRESS_RELEASE, &MleRouter::HandleAddressRelease, this), + mAddressSolicit(OT_URI_PATH_ADDRESS_SOLICIT, &MleRouter::HandleAddressSolicit, this), + mAddressRelease(OT_URI_PATH_ADDRESS_RELEASE, &MleRouter::HandleAddressRelease, this), mRouterIdSequence(0), mRouterIdSequenceLastUpdated(0), mMaxChildrenAllowed(kMaxChildren), @@ -3799,7 +3799,7 @@ ThreadError MleRouter::SendAddressSolicit(ThreadStatusTlv::Status aStatus) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_ADDRESS_SOLICIT); + header.AppendUriPathOptions(OT_URI_PATH_ADDRESS_SOLICIT); header.SetPayloadMarker(); VerifyOrExit((message = mNetif.GetCoap().NewMessage(header)) != NULL, error = kThreadError_NoBufs); @@ -3849,7 +3849,7 @@ ThreadError MleRouter::SendAddressRelease(void) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_ADDRESS_RELEASE); + header.AppendUriPathOptions(OT_URI_PATH_ADDRESS_RELEASE); header.SetPayloadMarker(); VerifyOrExit((message = mNetif.GetCoap().NewMessage(header)) != NULL, error = kThreadError_NoBufs); diff --git a/src/core/thread/network_data.cpp b/src/core/thread/network_data.cpp index 3c3cc40c4..5d15235a0 100644 --- a/src/core/thread/network_data.cpp +++ b/src/core/thread/network_data.cpp @@ -50,7 +50,7 @@ #include "mac/mac_frame.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" namespace ot { namespace NetworkData { @@ -619,7 +619,7 @@ ThreadError NetworkData::SendServerDataNotification(uint16_t aRloc16) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_SERVER_DATA); + header.AppendUriPathOptions(OT_URI_PATH_SERVER_DATA); header.SetPayloadMarker(); VerifyOrExit((message = mNetif.GetCoap().NewMessage(header)) != NULL, error = kThreadError_NoBufs); diff --git a/src/core/thread/network_data_leader.cpp b/src/core/thread/network_data_leader.cpp index b4373534a..8d76cbb7a 100644 --- a/src/core/thread/network_data_leader.cpp +++ b/src/core/thread/network_data_leader.cpp @@ -55,7 +55,7 @@ #include "thread/lowpan.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap16; diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index 287ab4d54..896ca659a 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -58,7 +58,7 @@ #include "thread/mle_router.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap16; @@ -68,9 +68,9 @@ namespace NetworkData { Leader::Leader(ThreadNetif &aThreadNetif): LeaderBase(aThreadNetif), mTimer(aThreadNetif.GetIp6().mTimerScheduler, &Leader::HandleTimer, this), - mServerData(OPENTHREAD_URI_SERVER_DATA, &Leader::HandleServerData, this), - mCommissioningDataGet(OPENTHREAD_URI_COMMISSIONER_GET, &Leader::HandleCommissioningGet, this), - mCommissioningDataSet(OPENTHREAD_URI_COMMISSIONER_SET, &Leader::HandleCommissioningSet, this) + mServerData(OT_URI_PATH_SERVER_DATA, &Leader::HandleServerData, this), + mCommissioningDataGet(OT_URI_PATH_COMMISSIONER_GET, &Leader::HandleCommissioningGet, this), + mCommissioningDataSet(OT_URI_PATH_COMMISSIONER_SET, &Leader::HandleCommissioningSet, this) { Reset(); } diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index d8c67b0ee..cbd7b7fa4 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -54,7 +54,7 @@ #include "thread/mle_router.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" #include "thread/network_diagnostic_tlvs.hpp" using ot::Encoding::BigEndian::HostSwap16; @@ -66,10 +66,10 @@ namespace ot { namespace NetworkDiagnostic { NetworkDiagnostic::NetworkDiagnostic(ThreadNetif &aThreadNetif) : - mDiagnosticGetRequest(OPENTHREAD_URI_DIAGNOSTIC_GET_REQUEST, &NetworkDiagnostic::HandleDiagnosticGetRequest, this), - mDiagnosticGetQuery(OPENTHREAD_URI_DIAGNOSTIC_GET_QUERY, &NetworkDiagnostic::HandleDiagnosticGetQuery, this), - mDiagnosticGetAnswer(OPENTHREAD_URI_DIAGNOSTIC_GET_ANSWER, &NetworkDiagnostic::HandleDiagnosticGetAnswer, this), - mDiagnosticReset(OPENTHREAD_URI_DIAGNOSTIC_RESET, &NetworkDiagnostic::HandleDiagnosticReset, this), + mDiagnosticGetRequest(OT_URI_PATH_DIAGNOSTIC_GET_REQUEST, &NetworkDiagnostic::HandleDiagnosticGetRequest, this), + mDiagnosticGetQuery(OT_URI_PATH_DIAGNOSTIC_GET_QUERY, &NetworkDiagnostic::HandleDiagnosticGetQuery, this), + mDiagnosticGetAnswer(OT_URI_PATH_DIAGNOSTIC_GET_ANSWER, &NetworkDiagnostic::HandleDiagnosticGetAnswer, this), + mDiagnosticReset(OT_URI_PATH_DIAGNOSTIC_RESET, &NetworkDiagnostic::HandleDiagnosticReset, this), mNetif(aThreadNetif), mReceiveDiagnosticGetCallback(NULL), mReceiveDiagnosticGetCallbackContext(NULL) @@ -105,14 +105,14 @@ ThreadError NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address &aDestinatio { header.Init(kCoapTypeNonConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_DIAGNOSTIC_GET_QUERY); + header.AppendUriPathOptions(OT_URI_PATH_DIAGNOSTIC_GET_QUERY); } else { handler = &NetworkDiagnostic::HandleDiagnosticGetResponse; header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_DIAGNOSTIC_GET_REQUEST); + header.AppendUriPathOptions(OT_URI_PATH_DIAGNOSTIC_GET_REQUEST); } if (aCount > 0) @@ -466,7 +466,7 @@ void NetworkDiagnostic::HandleDiagnosticGetQuery(Coap::Header &aHeader, Message header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_DIAGNOSTIC_GET_ANSWER); + header.AppendUriPathOptions(OT_URI_PATH_DIAGNOSTIC_GET_ANSWER); if (networkDiagnosticTlv.GetLength() > 0) { @@ -558,7 +558,7 @@ ThreadError NetworkDiagnostic::SendDiagnosticReset(const Ip6::Address &aDestinat header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_DIAGNOSTIC_RESET); + header.AppendUriPathOptions(OT_URI_PATH_DIAGNOSTIC_RESET); if (aCount > 0) { diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp index d42b5715a..a60c6fc6d 100644 --- a/src/core/thread/panid_query_server.cpp +++ b/src/core/thread/panid_query_server.cpp @@ -50,7 +50,7 @@ #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" namespace ot { @@ -58,7 +58,7 @@ PanIdQueryServer::PanIdQueryServer(ThreadNetif &aThreadNetif) : mChannelMask(0), mPanId(Mac::kPanIdBroadcast), mTimer(aThreadNetif.GetIp6().mTimerScheduler, &PanIdQueryServer::HandleTimer, this), - mPanIdQuery(OPENTHREAD_URI_PANID_QUERY, &PanIdQueryServer::HandleQuery, this), + mPanIdQuery(OT_URI_PATH_PANID_QUERY, &PanIdQueryServer::HandleQuery, this), mNetif(aThreadNetif) { mNetif.GetCoap().AddResource(mPanIdQuery); @@ -141,7 +141,7 @@ ThreadError PanIdQueryServer::SendConflict(void) header.Init(kCoapTypeConfirmable, kCoapRequestPost); header.SetToken(Coap::Header::kDefaultTokenLength); - header.AppendUriPathOptions(OPENTHREAD_URI_PANID_CONFLICT); + header.AppendUriPathOptions(OT_URI_PATH_PANID_CONFLICT); header.SetPayloadMarker(); VerifyOrExit((message = MeshCoP::NewMeshCoPMessage(mNetif.GetCoap(), header)) != NULL, diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp index 4eadc1fdd..daf33217d 100644 --- a/src/core/thread/thread_netif.cpp +++ b/src/core/thread/thread_netif.cpp @@ -49,7 +49,7 @@ #include "net/udp6.hpp" #include "thread/mle.hpp" #include "thread/thread_tlvs.hpp" -#include "thread/thread_uris.hpp" +#include "thread/thread_uri_paths.hpp" using ot::Encoding::BigEndian::HostSwap16; diff --git a/src/core/thread/thread_uris.hpp b/src/core/thread/thread_uri_paths.hpp similarity index 56% rename from src/core/thread/thread_uris.hpp rename to src/core/thread/thread_uri_paths.hpp index d2c2fd97f..a50f43a02 100644 --- a/src/core/thread/thread_uris.hpp +++ b/src/core/thread/thread_uri_paths.hpp @@ -40,223 +40,223 @@ namespace ot { * The URI Path for Address Query. * */ -#define OPENTHREAD_URI_ADDRESS_QUERY "a/aq" +#define OT_URI_PATH_ADDRESS_QUERY "a/aq" /** - * @def OPENTHREAD_URI_ADDRESS_NOTIFY + * @def OT_URI_PATH_ADDRESS_NOTIFY * * The URI Path for Address Notify. * */ -#define OPENTHREAD_URI_ADDRESS_NOTIFY "a/an" +#define OT_URI_PATH_ADDRESS_NOTIFY "a/an" /** - * @def OPENTHREAD_URI_ADDRESS_ERROR + * @def OT_URI_PATH_ADDRESS_ERROR * * The URI Path for Address Error. * */ -#define OPENTHREAD_URI_ADDRESS_ERROR "a/ae" +#define OT_URI_PATH_ADDRESS_ERROR "a/ae" /** - * @def OPENTHREAD_URI_ADDRESS_RELEASE + * @def OT_URI_PATH_ADDRESS_RELEASE * * The URI Path for Address Release. * */ -#define OPENTHREAD_URI_ADDRESS_RELEASE "a/ar" +#define OT_URI_PATH_ADDRESS_RELEASE "a/ar" /** - * @def OPENTHREAD_URI_ADDRESS_SOLICIT + * @def OT_URI_PATH_ADDRESS_SOLICIT * * The URI Path for Address Solicit. * */ -#define OPENTHREAD_URI_ADDRESS_SOLICIT "a/as" +#define OT_URI_PATH_ADDRESS_SOLICIT "a/as" /** - * @def OPENTHREAD_URI_ACTIVE_GET + * @def OT_URI_PATH_ACTIVE_GET * * The URI Path for MGMT_ACTIVE_GET * */ -#define OPENTHREAD_URI_ACTIVE_GET "c/ag" +#define OT_URI_PATH_ACTIVE_GET "c/ag" /** - * @def OPENTHREAD_URI_ACTIVE_SET + * @def OT_URI_PATH_ACTIVE_SET * * The URI Path for MGMT_ACTIVE_SET * */ -#define OPENTHREAD_URI_ACTIVE_SET "c/as" +#define OT_URI_PATH_ACTIVE_SET "c/as" /** - * @def OPENTHREAD_URI_DATASET_CHANGED + * @def OT_URI_PATH_DATASET_CHANGED * * The URI Path for MGMT_DATASET_CHANGED * */ -#define OPENTHREAD_URI_DATASET_CHANGED "c/dc" +#define OT_URI_PATH_DATASET_CHANGED "c/dc" /** - * @def OPENTHREAD_URI_ENERGY_SCAN + * @def OT_URI_PATH_ENERGY_SCAN * * The URI Path for Energy Scan * */ -#define OPENTHREAD_URI_ENERGY_SCAN "c/es" +#define OT_URI_PATH_ENERGY_SCAN "c/es" /** - * @def OPENTHREAD_URI_ENERGY_REPORT + * @def OT_URI_PATH_ENERGY_REPORT * * The URI Path for Energy Report * */ -#define OPENTHREAD_URI_ENERGY_REPORT "c/er" +#define OT_URI_PATH_ENERGY_REPORT "c/er" /** - * @def OPENTHREAD_URI_PENDING_GET + * @def OT_URI_PATH_PENDING_GET * * The URI Path for MGMT_PENDING_GET * */ -#define OPENTHREAD_URI_PENDING_GET "c/pg" +#define OT_URI_PATH_PENDING_GET "c/pg" /** - * @def OPENTHREAD_URI_PENDING_SET + * @def OT_URI_PATH_PENDING_SET * * The URI Path for MGMT_PENDING_SET * */ -#define OPENTHREAD_URI_PENDING_SET "c/ps" +#define OT_URI_PATH_PENDING_SET "c/ps" /** - * @def OPENTHREAD_URI_SERVER_DATA + * @def OT_URI_PATH_SERVER_DATA * * The URI Path for Server Data Registration. * */ -#define OPENTHREAD_URI_SERVER_DATA "a/sd" +#define OT_URI_PATH_SERVER_DATA "a/sd" /** - * @def OPENTHREAD_URI_ANNOUNCE_BEGIN + * @def OT_URI_PATH_ANNOUNCE_BEGIN * * The URI Path for Announce Begin. * */ -#define OPENTHREAD_URI_ANNOUNCE_BEGIN "c/ab" +#define OT_URI_PATH_ANNOUNCE_BEGIN "c/ab" /** - * @def OPENTHREAD_URI_RELAY_RX + * @def OT_URI_PATH_RELAY_RX * * The URI Path for Relay RX. * */ -#define OPENTHREAD_URI_RELAY_RX "c/rx" +#define OT_URI_PATH_RELAY_RX "c/rx" /** - * @def OPENTHREAD_URI_RELAY_TX + * @def OT_URI_PATH_RELAY_TX * * The URI Path for Relay TX. * */ -#define OPENTHREAD_URI_RELAY_TX "c/tx" +#define OT_URI_PATH_RELAY_TX "c/tx" /** - * @def OPENTHREAD_URI_JOINER_FINALIZE + * @def OT_URI_PATH_JOINER_FINALIZE * * The URI Path for Joiner Finalize * */ -#define OPENTHREAD_URI_JOINER_FINALIZE "c/jf" +#define OT_URI_PATH_JOINER_FINALIZE "c/jf" /** - * @def OPENTHREAD_URI_JOINER_ENTRUST + * @def OT_URI_PATH_JOINER_ENTRUST * * The URI Path for Joiner Entrust * */ -#define OPENTHREAD_URI_JOINER_ENTRUST "c/je" +#define OT_URI_PATH_JOINER_ENTRUST "c/je" /** - * @def OPENTHREAD_URI_LEADER_PETITION + * @def OT_URI_PATH_LEADER_PETITION * * The URI Path for Leader Petition * */ -#define OPENTHREAD_URI_LEADER_PETITION "c/lp" +#define OT_URI_PATH_LEADER_PETITION "c/lp" /** - * @def OPENTHREAD_URI_LEADER_KEEP_ALIVE + * @def OT_URI_PATH_LEADER_KEEP_ALIVE * * The URI Path for Leader Keep Alive * */ -#define OPENTHREAD_URI_LEADER_KEEP_ALIVE "c/la" +#define OT_URI_PATH_LEADER_KEEP_ALIVE "c/la" /** - * @def OPENTHREAD_URI_PANID_CONFLICT + * @def OT_URI_PATH_PANID_CONFLICT * * The URI Path for PAN ID Conflict * */ -#define OPENTHREAD_URI_PANID_CONFLICT "c/pc" +#define OT_URI_PATH_PANID_CONFLICT "c/pc" /** - * @def OPENTHREAD_URI_PANID_QUERY + * @def OT_URI_PATH_PANID_QUERY * * The URI Path for PAN ID Query * */ -#define OPENTHREAD_URI_PANID_QUERY "c/pq" +#define OT_URI_PATH_PANID_QUERY "c/pq" /** - * @def OPENTHREAD_URI_COMMISSIONER_GET + * @def OT_URI_PATH_COMMISSIONER_GET * * The URI Path for MGMT_COMMISSIONER_GET * */ -#define OPENTHREAD_URI_COMMISSIONER_GET "c/cg" +#define OT_URI_PATH_COMMISSIONER_GET "c/cg" /** - * @def OPENTHREAD_URI_COMMISSIONER_SET + * @def OT_URI_PATH_COMMISSIONER_SET * * The URI Path for MGMT_COMMISSIONER_SET * */ -#define OPENTHREAD_URI_COMMISSIONER_SET "c/cs" +#define OT_URI_PATH_COMMISSIONER_SET "c/cs" /** - * @def OPENTHREAD_URI_DIAGNOSTIC_GET_REQUEST + * @def OT_URI_PATH_DIAGNOSTIC_GET_REQUEST * * The URI Path for Network Diagnostic Get Request. * */ -#define OPENTHREAD_URI_DIAGNOSTIC_GET_REQUEST "d/dg" +#define OT_URI_PATH_DIAGNOSTIC_GET_REQUEST "d/dg" /** - * @def OPENTHREAD_URI_DIAGNOSTIC_GET_QUERY + * @def OT_URI_PATH_DIAGNOSTIC_GET_QUERY * * The URI Path for Network Diagnostic Get Query. * */ -#define OPENTHREAD_URI_DIAGNOSTIC_GET_QUERY "d/dq" +#define OT_URI_PATH_DIAGNOSTIC_GET_QUERY "d/dq" /** - * @def OPENTHREAD_URI_DIAGNOSTIC_GET_ANSWER + * @def OT_URI_PATH_DIAGNOSTIC_GET_ANSWER * * The URI Path for Network Diagnostic Get Answer. * */ -#define OPENTHREAD_URI_DIAGNOSTIC_GET_ANSWER "d/da" +#define OT_URI_PATH_DIAGNOSTIC_GET_ANSWER "d/da" /** - * @def OPENTHREAD_URI_DIAG_RST + * @def OT_URI_PATH_DIAG_RST * * The URI Path for Network Diagnostic Reset. * */ -#define OPENTHREAD_URI_DIAGNOSTIC_RESET "d/dr" +#define OT_URI_PATH_DIAGNOSTIC_RESET "d/dr" } // namespace ot