From 4ef45a45e6cbc913823f12e8bd71190f6e1e944c Mon Sep 17 00:00:00 2001 From: Nick Banks Date: Wed, 12 Oct 2016 14:28:19 -0700 Subject: [PATCH] Minor updates to openthread API signatures (#799) --- include/openthread.h | 11 ++++++----- src/core/openthread.cpp | 17 ++++++++++------- src/core/thread/network_diag.cpp | 5 +++-- src/core/thread/network_diag.hpp | 4 ++-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/include/openthread.h b/include/openthread.h index bfd86854a..eb81d37c9 100644 --- a/include/openthread.h +++ b/include/openthread.h @@ -175,7 +175,7 @@ const char *otGetVersionString(void); * @retval otInstance* The new OpenThread instance structure. * */ -otInstance *otInstanceInit(void *aInstanceBuffer, uint64_t *aInstanceBufferSize); +otInstance *otInstanceInit(void *aInstanceBuffer, size_t *aInstanceBufferSize); #else /** * This function initializes the static instance of the OpenThread library. @@ -894,7 +894,7 @@ ThreadError otGetActiveDataset(otInstance *aInstance, otOperationalDataset *aDat * @retval kThreadError_InvalidArgs @p aDataset was NULL. * */ -ThreadError otSetActiveDataset(otInstance *aInstance, otOperationalDataset *aDataset); +ThreadError otSetActiveDataset(otInstance *aInstance, const otOperationalDataset *aDataset); /** * This function gets the Pending Operational Dataset. @@ -919,7 +919,7 @@ ThreadError otGetPendingDataset(otInstance *aInstance, otOperationalDataset *aDa * @retval kThreadError_InvalidArgs @p aDataset was NULL. * */ -ThreadError otSetPendingDataset(otInstance *aInstance, otOperationalDataset *aDataset); +ThreadError otSetPendingDataset(otInstance *aInstance, const otOperationalDataset *aDataset); /** * This function sends MGMT_ACTIVE_GET. @@ -2308,7 +2308,8 @@ ThreadError otSendUdp(otUdpSocket *aSocket, otMessage aMessage, const otMessageI * @param[in] aTlvTypes An array of Network Diagnostic TLV types. * @param[in] aCount Number of types in aTlvTypes */ -ThreadError otSendDiagnosticGet(otInstance *aInstance, otIp6Address *aDestination, uint8_t aTlvTypes[], uint8_t aCount); +ThreadError otSendDiagnosticGet(otInstance *aInstance, const otIp6Address *aDestination, const uint8_t aTlvTypes[], + uint8_t aCount); /** * Send a Network Diagnostic Reset request @@ -2318,7 +2319,7 @@ ThreadError otSendDiagnosticGet(otInstance *aInstance, otIp6Address *aDestinatio * @param[in] aTlvTypes An array of Network Diagnostic TLV types. Currently only Type 9 is allowed. * @param[in] aCount Number of types in aTlvTypes */ -ThreadError otSendDiagnosticReset(otInstance *aInstance, otIp6Address *aDestination, uint8_t aTlvTypes[], +ThreadError otSendDiagnosticReset(otInstance *aInstance, const otIp6Address *aDestination, const uint8_t aTlvTypes[], uint8_t aCount); /** diff --git a/src/core/openthread.cpp b/src/core/openthread.cpp index f02a69379..a251fa056 100644 --- a/src/core/openthread.cpp +++ b/src/core/openthread.cpp @@ -964,7 +964,7 @@ ThreadError otSetPreferredRouterId(otInstance *aInstance, uint8_t aRouterId) #ifdef OPENTHREAD_MULTIPLE_INSTANCE -otInstance *otInstanceInit(void *aInstanceBuffer, uint64_t *aInstanceBufferSize) +otInstance *otInstanceInit(void *aInstanceBuffer, size_t *aInstanceBufferSize) { otInstance *aInstance = NULL; @@ -1003,17 +1003,20 @@ exit: #endif -ThreadError otSendDiagnosticGet(otInstance *aInstance, otIp6Address *aDestination, uint8_t aTlvTypes[], uint8_t aCount) +ThreadError otSendDiagnosticGet(otInstance *aInstance, const otIp6Address *aDestination, const uint8_t aTlvTypes[], + uint8_t aCount) { - return aInstance->mThreadNetif.GetNetworkDiagnostic().SendDiagnosticGet(*static_cast(aDestination), + return aInstance->mThreadNetif.GetNetworkDiagnostic().SendDiagnosticGet(*static_cast + (aDestination), aTlvTypes, aCount); } -ThreadError otSendDiagnosticReset(otInstance *aInstance, otIp6Address *aDestination, uint8_t aTlvTypes[], +ThreadError otSendDiagnosticReset(otInstance *aInstance, const otIp6Address *aDestination, const uint8_t aTlvTypes[], uint8_t aCount) { - return aInstance->mThreadNetif.GetNetworkDiagnostic().SendDiagnosticReset(*static_cast(aDestination), + return aInstance->mThreadNetif.GetNetworkDiagnostic().SendDiagnosticReset(*static_cast + (aDestination), aTlvTypes, aCount); } @@ -1340,7 +1343,7 @@ exit: return error; } -ThreadError otSetActiveDataset(otInstance *aInstance, otOperationalDataset *aDataset) +ThreadError otSetActiveDataset(otInstance *aInstance, const otOperationalDataset *aDataset) { ThreadError error; @@ -1364,7 +1367,7 @@ exit: return error; } -ThreadError otSetPendingDataset(otInstance *aInstance, otOperationalDataset *aDataset) +ThreadError otSetPendingDataset(otInstance *aInstance, const otOperationalDataset *aDataset) { ThreadError error; diff --git a/src/core/thread/network_diag.cpp b/src/core/thread/network_diag.cpp index 479b3d44c..886c20630 100644 --- a/src/core/thread/network_diag.cpp +++ b/src/core/thread/network_diag.cpp @@ -66,7 +66,8 @@ NetworkDiagnostic::NetworkDiagnostic(ThreadNetif &aThreadNetif) : mCoapMessageId = static_cast(otPlatRandomGet()); } -ThreadError NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address &aDestination, uint8_t aTlvTypes[], uint8_t aCount) +ThreadError NetworkDiagnostic::SendDiagnosticGet(const Ip6::Address &aDestination, const uint8_t aTlvTypes[], + uint8_t aCount) { ThreadError error; Ip6::SockAddr sockaddr; @@ -140,7 +141,7 @@ exit: (void)aMessageInfo; } -ThreadError NetworkDiagnostic::SendDiagnosticReset(const Ip6::Address &aDestination, uint8_t aTlvTypes[], +ThreadError NetworkDiagnostic::SendDiagnosticReset(const Ip6::Address &aDestination, const uint8_t aTlvTypes[], uint8_t aCount) { ThreadError error; diff --git a/src/core/thread/network_diag.hpp b/src/core/thread/network_diag.hpp index 813ad9f8a..86d4f6ce8 100644 --- a/src/core/thread/network_diag.hpp +++ b/src/core/thread/network_diag.hpp @@ -79,7 +79,7 @@ public: * @param[in] aCount Number of types in aTlvTypes * */ - ThreadError SendDiagnosticGet(const Ip6::Address &aDestination, uint8_t aTlvTypes[], uint8_t aCount); + ThreadError SendDiagnosticGet(const Ip6::Address &aDestination, const uint8_t aTlvTypes[], uint8_t aCount); /** * This method sends Diagnostic Reset request. @@ -89,7 +89,7 @@ public: * @param[in] aCount Number of types in aTlvTypes * */ - ThreadError SendDiagnosticReset(const Ip6::Address &aDestination, uint8_t aTlvTypes[], uint8_t aCount); + ThreadError SendDiagnosticReset(const Ip6::Address &aDestination, const uint8_t aTlvTypes[], uint8_t aCount); /** * This method fills IPv6AddressListTlv.