From 30bf77808e68f60be66fcee0e8dd331498af89bf Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 8 May 2020 17:28:43 -0700 Subject: [PATCH] [network-data] change RegisterNetworkData() to return void (#4941) --- src/core/thread/network_data_leader_ftd.cpp | 11 +++++++---- src/core/thread/network_data_leader_ftd.hpp | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index 31f383bba..fb690bc76 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -160,8 +160,7 @@ void Leader::HandleServerData(Coap::Message &aMessage, const Ip6::MessageInfo &a if (ThreadTlv::GetTlv(aMessage, ThreadTlv::kThreadNetworkData, sizeof(networkData), networkData) == OT_ERROR_NONE) { VerifyOrExit(networkData.IsValid(), OT_NOOP); - IgnoreError(RegisterNetworkData(aMessageInfo.GetPeerAddr().GetLocator(), networkData.GetTlvs(), - networkData.GetLength())); + RegisterNetworkData(aMessageInfo.GetPeerAddr().GetLocator(), networkData.GetTlvs(), networkData.GetLength()); } SuccessOrExit(Get().SendEmptyAck(aMessage, aMessageInfo)); @@ -702,7 +701,7 @@ exit: return status; } -otError Leader::RegisterNetworkData(uint16_t aRloc16, const uint8_t *aTlvs, uint8_t aTlvsLength) +void Leader::RegisterNetworkData(uint16_t aRloc16, const uint8_t *aTlvs, uint8_t aTlvsLength) { otError error = OT_ERROR_NONE; const NetworkDataTlv *end = reinterpret_cast(aTlvs + aTlvsLength); @@ -741,7 +740,11 @@ otError Leader::RegisterNetworkData(uint16_t aRloc16, const uint8_t *aTlvs, uint otDumpDebgNetData("add done", mTlvs, mLength); exit: - return error; + + if (error != OT_ERROR_NONE) + { + otLogNoteNetData("Failed to register network data: %s", otThreadErrorToString(error)); + } } otError Leader::AddPrefix(const PrefixTlv &aPrefix, ChangedFlags &aChangedFlags) diff --git a/src/core/thread/network_data_leader_ftd.hpp b/src/core/thread/network_data_leader_ftd.hpp index f3bfa4af6..f0f70badc 100644 --- a/src/core/thread/network_data_leader_ftd.hpp +++ b/src/core/thread/network_data_leader_ftd.hpp @@ -206,7 +206,7 @@ private: static void HandleTimer(Timer &aTimer); void HandleTimer(void); - otError RegisterNetworkData(uint16_t aRloc16, const uint8_t *aTlvs, uint8_t aTlvsLength); + void RegisterNetworkData(uint16_t aRloc16, const uint8_t *aTlvs, uint8_t aTlvsLength); otError AddPrefix(const PrefixTlv &aPrefix, ChangedFlags &aChangedFlags); otError AddHasRoute(const HasRouteTlv &aHasRoute, PrefixTlv &aDstPrefix, ChangedFlags &aChangedFlags);