Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[dtls] address race with fd isset #90

Merged
merged 11 commits into from
Aug 16, 2017
Merged

[dtls] address race with fd isset #90

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
80ac484
TIOP-158 | Add gitignore files
DuaneEllis-TI Jul 28, 2017
bc573ed
Merge pull request #1 in TIOP/borderrouter from feature/TIOP-158-bord…
DuaneEllis-TI Jul 28, 2017
f2b42c7
Missing terminal newline
DuaneEllis-TI Jul 28, 2017
84df214
Per request, single .gitignore
DuaneEllis-TI Jul 31, 2017
972f0a9
BUG, UDP messages lost during relay operation
DuaneEllis-TI Aug 14, 2017
f28e31d
Remove old logging code
DuaneEllis-TI Aug 14, 2017
b2cdc8a
make pretty
DuaneEllis-TI Aug 15, 2017
ddd5fb8
Merge public
DuaneEllis-TI Aug 15, 2017
68a0543
Issue #87 - problem with FD_ISSET()
DuaneEllis-TI Aug 15, 2017
78c5150
Per review comments.
DuaneEllis-TI Aug 16, 2017
69d8ad0
Nit fix, space
DuaneEllis-TI Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/agent/dtls_mbedtls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,14 @@ void MbedtlsServer::UpdateFdSet(fd_set &aReadFdSet, fd_set &aWriteFdSet, fd_set
}
}

FD_SET(mSocket, &aReadFdSet);

if (aMaxFd < mSocket)
if (mSocket >= 0)
{
aMaxFd = mSocket;
FD_SET(mSocket, &aReadFdSet);

if (aMaxFd < mSocket)
{
aMaxFd = mSocket;
}
}

aTimeout.tv_sec = timeout / 1000;
Expand All @@ -486,13 +489,17 @@ void MbedtlsServer::ProcessServer(const fd_set &aReadFdSet, const fd_set &aWrite
{
uint8_t packet[kMaxSizeOfPacket];
uint8_t control[kMaxSizeOfControl];
otbrError error = OTBR_ERROR_ERRNO;
otbrError error = OTBR_ERROR_ERRNO; // Assume error
sockaddr_in6 src;
sockaddr_in6 dst;
struct msghdr msghdr;
struct iovec iov[1];

VerifyOrExit(FD_ISSET(mSocket, &aReadFdSet));
/* Connection is not alive yet, or is shut down */
VerifyOrExit(mSocket >= 0, error = OTBR_ERROR_NONE);

/* If this is not set, then some other handle became rd/wr able, it is not an error */
VerifyOrExit( FD_ISSET(mSocket, &aReadFdSet), error = OTBR_ERROR_NONE);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: extra space.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit fixed


otbrLog(OTBR_LOG_INFO, "Trying to accept connection...");
memset(&src, 0, sizeof(src));
Expand Down Expand Up @@ -548,6 +555,7 @@ void MbedtlsServer::ProcessServer(const fd_set &aReadFdSet, const fd_set &aWrite
otbrLog(OTBR_LOG_ERR, "DTLS failed to initiate new session: %s.", otbrErrorString(error));
otbrLog(OTBR_LOG_INFO, "Trying to create new server socket...");
close(mSocket);
mSocket = -1;

if (Bind())
{
Expand Down
1 change: 1 addition & 0 deletions src/agent/dtls_mbedtls.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ class MbedtlsServer : public Server
*
*/
MbedtlsServer(uint16_t aPort, StateHandler aStateHandler, void *aContext) :
mSocket(-1),
mPort(aPort),
mStateHandler(aStateHandler),
mContext(aContext) {}
Expand Down
1 change: 1 addition & 0 deletions tests/meshcop/commissioner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ int CommissionerServe(Context &aContext)
VerifyOrExit(aContext.mSocket != -1, ret = errno);
aContext.mDtlsServer = Dtls::Server::Create(kPortJoinerSession, HandleSessionChange, &aContext);
aContext.mDtlsServer->SetPSK(kPSKd, strlen(reinterpret_cast<const char *>(kPSKd)));
aContext.mDtlsServer->Start();

while (aContext.mState != kStateDone && aContext.mState != kStateError)
{
Expand Down