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

[address-resolver] change SendAddressError() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 1e5d816838
commit 19ac977b08
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/address_resolver.cpp
+12 -10
View File
@@ -633,8 +633,7 @@ void AddressResolver::HandleAddressNotification(Coap::Message &aMessage, const I
// by more than one device. Try to resolve the duplicate
// address by sending an Address Error message.
VerifyOrExit(entry->HasMeshLocalIid(meshLocalIid),
IgnoreError(SendAddressError(target, meshLocalIid, NULL)));
VerifyOrExit(entry->HasMeshLocalIid(meshLocalIid), SendAddressError(target, meshLocalIid, NULL));
VerifyOrExit(lastTransactionTime < entry->GetLastTransactionTime(), OT_NOOP);
}
@@ -660,9 +659,9 @@ exit:
return;
}
otError AddressResolver::SendAddressError(const Ip6::Address &aTarget,
const uint8_t * aMeshLocalIid,
const Ip6::Address *aDestination)
void AddressResolver::SendAddressError(const Ip6::Address &aTarget,
const uint8_t * aMeshLocalIid,
const Ip6::Address *aDestination)
{
otError error;
Coap::Message * message;
@@ -696,12 +695,15 @@ otError AddressResolver::SendAddressError(const Ip6::Address &aTarget,
exit:
if (error != OT_ERROR_NONE && message != NULL)
if (error != OT_ERROR_NONE)
{
message->Free();
}
otLogInfoArp("Failed to send address error: %s", otThreadErrorToString(error));
return error;
if (message != NULL)
{
message->Free();
}
}
}
void AddressResolver::HandleAddressError(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo)
@@ -766,7 +768,7 @@ void AddressResolver::HandleAddressError(Coap::Message &aMessage, const Ip6::Mes
{
SuccessOrExit(error = Get<Mle::Mle>().GetLocatorAddress(destination, child.GetRloc16()));
IgnoreError(SendAddressError(target, meshLocalIid, &destination));
SendAddressError(target, meshLocalIid, &destination);
ExitNow();
}
}
src/core/thread/address_resolver.hpp
+5 -7
View File
@@ -277,13 +277,11 @@ private:
void RemoveCacheEntry(CacheEntry &aEntry, CacheEntryList &aList, CacheEntry *aPrevEntry, Reason aReason);
otError SendAddressQuery(const Ip6::Address &aEid);
otError SendAddressError(const Ip6::Address &aTarget,
const uint8_t * aMeshLocalIid,
const Ip6::Address *aDestination);
void SendAddressQueryResponse(const Ip6::Address &aTarget,
const uint8_t * aMeshLocalIid,
const uint32_t * aLastTransactionTimeTlv,
const Ip6::Address &aDestination);
void SendAddressError(const Ip6::Address &aTarget, const uint8_t *aMeshLocalIid, const Ip6::Address *aDestination);
void SendAddressQueryResponse(const Ip6::Address &aTarget,
const uint8_t * aMeshLocalIid,
const uint32_t * aLastTransactionTimeTlv,
const Ip6::Address &aDestination);
static void HandleUdpReceive(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo);