espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-06-05 21:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[coaps] fix disconnect in CoAP secure (#3221)

Browse Source
This commit is contained in:
Yakun Xu
2018-10-30 03:37:24 +08:00
committed by Jonathan Hui
parent bbd8b3466f
commit dcc9b7e249
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/coap/coap_secure.cpp
+9 -1
View File
@@ -151,7 +151,15 @@ bool CoapSecure::IsConnected(void)
otError CoapSecure::Disconnect(void)
{
return GetNetif().GetDtls().Stop();
Ip6::SockAddr sockAddr;
otError error = OT_ERROR_NONE;
SuccessOrExit(error = GetNetif().GetDtls().Stop());
// Disconnect from previous peer by connecting to any address
SuccessOrExit(error = mSocket.Connect(sockAddr));
exit:
return error;
}
MeshCoP::Dtls &CoapSecure::GetDtls(void)
src/posix/platform/udp.cpp
+35 -4
View File
@@ -281,17 +281,48 @@ otError otPlatUdpConnect(otUdpSocket *aUdpSocket)
otError error = OT_ERROR_NONE;
struct sockaddr_in6 sin6;
int fd;
bool isDisconnect = memcmp(&aUdpSocket->mPeerName.mAddress, &in6addr_any, sizeof(in6addr_any)) == 0 &&
aUdpSocket->mPeerName.mPort == 0;
VerifyOrExit(aUdpSocket->mHandle != NULL, error = OT_ERROR_INVALID_ARGS);
fd = FdFromHandle(aUdpSocket->mHandle);
memset(&sin6, 0, sizeof(struct sockaddr_in6));
sin6.sin6_port = htons(aUdpSocket->mPeerName.mPort);
sin6.sin6_family = AF_INET6;
memcpy(&sin6.sin6_addr, &aUdpSocket->mPeerName.mAddress, sizeof(sin6.sin6_addr));
sin6.sin6_port = htons(aUdpSocket->mPeerName.mPort);
if (!isDisconnect)
{
sin6.sin6_family = AF_INET6;
memcpy(&sin6.sin6_addr, &aUdpSocket->mPeerName.mAddress, sizeof(sin6.sin6_addr));
}
else
{
#ifdef __APPLE__
sin6.sin6_family = AF_UNSPEC;
#else
// There is a bug in linux that connecting to AF_UNSPEC does not disconnect.
// We create new socket to disconnect.
SuccessOrExit(error = otPlatUdpClose(aUdpSocket));
SuccessOrExit(error = otPlatUdpSocket(aUdpSocket));
SuccessOrExit(error = otPlatUdpBind(aUdpSocket));
ExitNow();
#endif
}
VerifyOrExit(0 == connect(fd, reinterpret_cast<struct sockaddr *>(&sin6), sizeof(sin6)), error = OT_ERROR_FAILED);
switch (connect(fd, reinterpret_cast<struct sockaddr *>(&sin6), sizeof(sin6)))
{
case 0:
break;
#ifdef __APPLE__
case EAFNOSUPPORT:
VerifyOrExit(isDisconnect, error = OT_ERROR_FAILED);
break;
#endif
default:
error = OT_ERROR_FAILED;
break;
}
exit:
return error;