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

[dtls] remove unnecessary member variables (#4090)

Browse Source
This commit is contained in:
Yakun Xu
2019-08-12 10:46:51 -07:00
committed by Jonathan Hui
parent 72d7513b03
commit 80f982301c
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dtls.cpp
+8 -12
View File
@@ -66,8 +66,6 @@ Dtls::Dtls(Instance &aInstance, bool aLayerTwoSecurity)
, mTimerSet(false)
, mLayerTwoSecurity(aLayerTwoSecurity)
, mReceiveMessage(NULL)
, mReceiveOffset(0)
, mReceiveLength(0)
, mConnectedHandler(NULL)
, mReceiveHandler(NULL)
, mSendHandler(NULL)
@@ -207,7 +205,7 @@ void Dtls::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageI
}
#endif
Receive(aMessage, aMessage.GetOffset(), aMessage.GetLength() - aMessage.GetOffset());
Receive(aMessage);
exit:
return;
@@ -568,11 +566,9 @@ exit:
return error;
}
void Dtls::Receive(Message &aMessage, uint16_t aOffset, uint16_t aLength)
void Dtls::Receive(Message &aMessage)
{
mReceiveMessage = &aMessage;
mReceiveOffset = aOffset;
mReceiveLength = aLength;
Process();
@@ -644,16 +640,16 @@ int Dtls::HandleMbedtlsReceive(unsigned char *aBuf, size_t aLength)
}
#endif // OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
VerifyOrExit(mReceiveMessage != NULL && mReceiveLength != 0, rval = MBEDTLS_ERR_SSL_WANT_READ);
VerifyOrExit(mReceiveMessage != NULL && (rval = mReceiveMessage->GetLength() - mReceiveMessage->GetOffset()) > 0,
rval = MBEDTLS_ERR_SSL_WANT_READ);
if (aLength > mReceiveLength)
if (aLength > static_cast<size_t>(rval))
{
aLength = mReceiveLength;
aLength = static_cast<size_t>(rval);
}
rval = mReceiveMessage->Read(mReceiveOffset, static_cast<uint16_t>(aLength), aBuf);
mReceiveOffset += static_cast<uint16_t>(rval);
mReceiveLength -= static_cast<uint16_t>(rval);
rval = mReceiveMessage->Read(mReceiveMessage->GetOffset(), static_cast<uint16_t>(aLength), aBuf);
mReceiveMessage->MoveOffset(rval);
exit:
return rval;
src/core/meshcop/dtls.hpp
+2 -7
View File
@@ -364,11 +364,9 @@ public:
* This method provides a received DTLS message to the DTLS object.
*
* @param[in] aMessage A reference to the message.
* @param[in] aOffset The offset within @p aMessage where the DTLS message starts.
* @param[in] aLength The size of the DTLS message (bytes).
*
*/
void Receive(Message &aMessage, uint16_t aOffset, uint16_t aLength);
void Receive(Message &aMessage);
/**
* This method sets the default message sub-type that will be used for all messages without defined
@@ -488,10 +486,7 @@ private:
bool mLayerTwoSecurity : 1;
const Message *mReceiveMessage;
uint16_t mReceiveOffset;
uint16_t mReceiveLength;
Message *mReceiveMessage;
ConnectedHandler mConnectedHandler;
ReceiveHandler mReceiveHandler;