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

free response on failure (#1768)

Browse Source
This commit is contained in:
Buke Po
2017-05-13 19:03:33 -07:00
committed by Jonathan Hui
parent 39b1162b1e
commit 15cf846075
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/coap/coap.cpp
+17 -6
View File
@@ -512,7 +512,11 @@ void Coap::Receive(Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
}
exit:
otLogInfoCoapErr(mNetif.GetInstance(), error, "Receive failed");
if (error)
{
otLogInfoCoapErr(mNetif.GetInstance(), error, "Receive failed");
}
}
void Coap::ProcessReceivedResponse(Header &aResponseHeader, Message &aMessage,
@@ -600,7 +604,8 @@ void Coap::ProcessReceivedRequest(Header &aHeader, Message &aMessage, const Ip6:
char uriPath[Resource::kMaxReceivedUriPath] = "";
char *curUriPath = uriPath;
const Header::Option *coapOption;
Message *response;
Message *response = NULL;
ThreadError error = kThreadError_None;
if (mInterceptor != NULL)
{
@@ -613,9 +618,9 @@ void Coap::ProcessReceivedRequest(Header &aHeader, Message &aMessage, const Ip6:
switch (mResponsesQueue.GetMatchedResponseCopy(aHeader, aMessageInfo, &response))
{
case kThreadError_None:
SendMessage(*response, aMessageInfo);
// fall through
error = Send(*response, aMessageInfo);
// fall through
;
case kThreadError_NoBufs:
ExitNow();
@@ -652,7 +657,7 @@ void Coap::ProcessReceivedRequest(Header &aHeader, Message &aMessage, const Ip6:
curUriPath[0] = '\0';
for (Resource *resource = mResources; resource; resource = resource->GetNext())
for (const Resource *resource = mResources; resource; resource = resource->GetNext())
{
if (strcmp(resource->mUriPath, uriPath) == 0)
{
@@ -662,6 +667,12 @@ void Coap::ProcessReceivedRequest(Header &aHeader, Message &aMessage, const Ip6:
}
exit:
if (error != kThreadError_None && response != NULL)
{
response->Free();
}
return;
}
src/core/coap/coap.hpp
+1 -1
View File
@@ -227,7 +227,7 @@ public:
Resource *GetNext(void) const { return static_cast<Resource *>(mNext); };
private:
void HandleRequest(Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo) {
void HandleRequest(Header &aHeader, Message &aMessage, const Ip6::MessageInfo &aMessageInfo) const {
mHandler(mContext, &aHeader, &aMessage, &aMessageInfo);
}
};