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

[joiner-router] change DelaySendingJoinerEntrust() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 97debabc03
commit 988d39ba34
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/joiner_router.cpp
+9 -6
View File
@@ -222,7 +222,7 @@ void JoinerRouter::HandleRelayTransmit(Coap::Message &aMessage, const Ip6::Messa
{
otLogInfoMeshCoP("Received kek");
IgnoreError(DelaySendingJoinerEntrust(messageInfo, kek));
DelaySendingJoinerEntrust(messageInfo, kek);
}
exit:
@@ -232,7 +232,7 @@ exit:
}
}
otError JoinerRouter::DelaySendingJoinerEntrust(const Ip6::MessageInfo &aMessageInfo, const Kek &aKek)
void JoinerRouter::DelaySendingJoinerEntrust(const Ip6::MessageInfo &aMessageInfo, const Kek &aKek)
{
otError error = OT_ERROR_NONE;
Message * message = Get<MessagePool>().New(Message::kTypeOther, 0);
@@ -256,12 +256,15 @@ otError JoinerRouter::DelaySendingJoinerEntrust(const Ip6::MessageInfo &aMessage
exit:
if (error != OT_ERROR_NONE && message != NULL)
if (error != OT_ERROR_NONE)
{
message->Free();
}
otLogNoteMeshCoP("Failed to schedule joiner entrust: %s", otThreadErrorToString(error));
return error;
if (message != NULL)
{
message->Free();
}
}
}
void JoinerRouter::HandleTimer(Timer &aTimer)
src/core/meshcop/joiner_router.hpp
+1 -1
View File
@@ -112,7 +112,7 @@ private:
static void HandleTimer(Timer &aTimer);
void HandleTimer(void);
otError DelaySendingJoinerEntrust(const Ip6::MessageInfo &aMessageInfo, const Kek &aKek);
void DelaySendingJoinerEntrust(const Ip6::MessageInfo &aMessageInfo, const Kek &aKek);
void SendDelayedJoinerEntrust(void);
otError SendJoinerEntrust(const Ip6::MessageInfo &aMessageInfo);
Coap::Message *PrepareJoinerEntrustMessage(void);