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

[dhcp6-client] change Solicit() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent e79a7be773
commit 0315ac0a0f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/dhcp6_client.cpp
+9 -6
View File
@@ -238,7 +238,7 @@ bool Dhcp6Client::HandleTrickleTimer(void)
// fall through
case kIaStatusSoliciting:
IgnoreError(Solicit(mIdentityAssociationCurrent->mPrefixAgentRloc));
Solicit(mIdentityAssociationCurrent->mPrefixAgentRloc);
break;
case kIaStatusSolicitReplied:
@@ -261,7 +261,7 @@ exit:
return rval;
}
otError Dhcp6Client::Solicit(uint16_t aRloc16)
void Dhcp6Client::Solicit(uint16_t aRloc16)
{
otError error = OT_ERROR_NONE;
Message * message;
@@ -290,12 +290,15 @@ otError Dhcp6Client::Solicit(uint16_t aRloc16)
exit:
if (message != NULL && error != OT_ERROR_NONE)
if (message != NULL)
{
message->Free();
}
otLogWarnIp6("Failed to send DHCPv6 Solicit: %s", otThreadErrorToString(error));
return error;
if (error != OT_ERROR_NONE)
{
message->Free();
}
}
}
otError Dhcp6Client::AppendHeader(Message &aMessage)
src/core/net/dhcp6_client.hpp
+1 -1
View File
@@ -123,7 +123,7 @@ private:
static bool MatchNetifAddressWithPrefix(const Ip6::NetifUnicastAddress &aAddress, const otIp6Prefix &aIp6Prefix);
otError Solicit(uint16_t aRloc16);
void Solicit(uint16_t aRloc16);
void AddIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6Prefix);
void RemoveIdentityAssociation(uint16_t aRloc16, otIp6Prefix &aIp6Prefix);