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

[meshcop] change "send" methods to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 4e9cefbb84
commit d20a65b87c
3 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_manager_ftd.cpp
+1 -1
View File
@@ -256,7 +256,7 @@ otError DatasetManager::HandleSet(Coap::Message &aMessage, const Ip6::MessageInf
SuccessOrExit(
Get<Mle::MleRouter>().GetCommissionerAloc(destination, localSessionId->GetCommissionerSessionId()));
IgnoreError(Get<Leader>().SendDatasetChanged(destination));
Get<Leader>().SendDatasetChanged(destination);
}
exit:
src/core/meshcop/meshcop_leader.cpp
+30 -21
View File
@@ -117,12 +117,12 @@ void Leader::HandlePetition(Coap::Message &aMessage, const Ip6::MessageInfo &aMe
mTimer.Start(Time::SecToMsec(kTimeoutLeaderPetition));
exit:
IgnoreError(SendPetitionResponse(aMessage, aMessageInfo, state));
SendPetitionResponse(aMessage, aMessageInfo, state);
}
otError Leader::SendPetitionResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
StateTlv::State aState)
void Leader::SendPetitionResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
StateTlv::State aState)
{
otError error = OT_ERROR_NONE;
Coap::Message *message;
@@ -150,12 +150,15 @@ otError Leader::SendPetitionResponse(const Coap::Message & aRequest,
exit:
if (error != OT_ERROR_NONE && message != NULL)
if (error != OT_ERROR_NONE)
{
message->Free();
}
otLogInfoMeshCoP("Failed to send petition response: %s", otThreadErrorToString(error));
return error;
if (message != NULL)
{
message->Free();
}
}
}
void Leader::HandleKeepAlive(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo)
@@ -203,15 +206,15 @@ void Leader::HandleKeepAlive(Coap::Message &aMessage, const Ip6::MessageInfo &aM
mTimer.Start(Time::SecToMsec(kTimeoutLeaderPetition));
}
IgnoreError(SendKeepAliveResponse(aMessage, aMessageInfo, responseState));
SendKeepAliveResponse(aMessage, aMessageInfo, responseState);
exit:
return;
}
otError Leader::SendKeepAliveResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
StateTlv::State aState)
void Leader::SendKeepAliveResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
StateTlv::State aState)
{
otError error = OT_ERROR_NONE;
Coap::Message *message;
@@ -229,15 +232,18 @@ otError Leader::SendKeepAliveResponse(const Coap::Message & aRequest,
exit:
if (error != OT_ERROR_NONE && message != NULL)
if (error != OT_ERROR_NONE)
{
message->Free();
}
otLogWarnMeshCoP("Failed to send keep alive response: %s", otThreadErrorToString(error));
return error;
if (message != NULL)
{
message->Free();
}
}
}
otError Leader::SendDatasetChanged(const Ip6::Address &aAddress)
void Leader::SendDatasetChanged(const Ip6::Address &aAddress)
{
otError error = OT_ERROR_NONE;
Ip6::MessageInfo messageInfo;
@@ -256,12 +262,15 @@ otError Leader::SendDatasetChanged(const Ip6::Address &aAddress)
exit:
if (error != OT_ERROR_NONE && message != NULL)
if (error != OT_ERROR_NONE)
{
message->Free();
}
otLogWarnMeshCoP("Failed to send dataset changed: %s", otThreadErrorToString(error));
return error;
if (message != NULL)
{
message->Free();
}
}
}
otError Leader::SetDelayTimerMinimal(uint32_t aDelayTimerMinimal)
src/core/meshcop/meshcop_leader.hpp
+3 -6
View File
@@ -77,11 +77,8 @@ public:
*
* @param[in] aAddress The IPv6 address of destination.
*
* @retval OT_ERROR_NONE Successfully send MGMT_DATASET_CHANGED message.
* @retval OT_ERROR_NO_BUFS Insufficient buffers to generate a MGMT_DATASET_CHANGED message.
*
*/
otError SendDatasetChanged(const Ip6::Address &aAddress);
void SendDatasetChanged(const Ip6::Address &aAddress);
/**
* This method sets minimal delay timer.
@@ -119,13 +116,13 @@ private:
static void HandlePetition(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo);
void HandlePetition(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
otError SendPetitionResponse(const Coap::Message & aRequest,
void SendPetitionResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
StateTlv::State aState);
static void HandleKeepAlive(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo);
void HandleKeepAlive(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
otError SendKeepAliveResponse(const Coap::Message & aRequest,
void SendKeepAliveResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
StateTlv::State aState);