From 80ac484a1cb85ecfee9012dfa2f44af6da1077af Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Fri, 28 Jul 2017 10:48:47 -0700 Subject: [PATCH 1/8] TIOP-158 | Add gitignore files --- .gitignore | 25 ++++++++++++++++++++++++ doc/.gitignore | 6 ++++++ include/.gitignore | 5 +++++ src/.gitignore | 9 +++++++++ src/agent/.gitignore | 2 ++ src/web/.gitignore | 2 ++ tests/.gitignore | 4 ++++ tests/mdns/.gitignore | 1 + tests/meshcop/.gitignore | 1 + third_party/.gitignore | 4 ++++ third_party/Simple-web-server/.gitignore | 2 ++ third_party/angular-material/.gitignore | 2 ++ third_party/angular/.gitignore | 2 ++ third_party/libcoap/.gitignore | 2 ++ third_party/mbedtls/.gitignore | 7 +++++++ third_party/mdl/.gitignore | 2 ++ third_party/wpantund/.gitignore | 5 +++++ tools/.gitignore | 6 ++++++ 18 files changed, 87 insertions(+) create mode 100644 .gitignore create mode 100644 doc/.gitignore create mode 100644 include/.gitignore create mode 100644 src/.gitignore create mode 100644 src/agent/.gitignore create mode 100644 src/web/.gitignore create mode 100644 tests/.gitignore create mode 100644 tests/mdns/.gitignore create mode 100644 tests/meshcop/.gitignore create mode 100644 third_party/.gitignore create mode 100644 third_party/Simple-web-server/.gitignore create mode 100644 third_party/angular-material/.gitignore create mode 100644 third_party/angular/.gitignore create mode 100644 third_party/libcoap/.gitignore create mode 100644 third_party/mbedtls/.gitignore create mode 100644 third_party/mdl/.gitignore create mode 100644 third_party/wpantund/.gitignore create mode 100644 tools/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..a5cb7a8a6f8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# To avoid recursively ignoring things in thirdparty +# most of these start with a / +/Makefile.in +/Makefile +/aclocal.m4 +/autom4te.cache/ +/configure +/config.log +/config.status +/libtool +/.local-version +/._build + +# This is for EMACS lock file, the [] escapes the # comment char. +[#]*[#] +.[#]* + +# Standard editor backup files +*~ +*.bak + +# VIM +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] + diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000000..35702cbff8c --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,6 @@ +Makefile +Makefile.in +html +Doxyfile + + diff --git a/include/.gitignore b/include/.gitignore new file mode 100644 index 00000000000..90d6e0bafa7 --- /dev/null +++ b/include/.gitignore @@ -0,0 +1,5 @@ +Makefile +Makefile.in +otbr-config.h +otbr-config.h.in +stamp-h1 diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 00000000000..d559ac29f99 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,9 @@ +Makefile +Makefile.in +.deps +.libs +.dirstamp +*.o +*.la +*.lo + diff --git a/src/agent/.gitignore b/src/agent/.gitignore new file mode 100644 index 00000000000..1dfc5e8fc64 --- /dev/null +++ b/src/agent/.gitignore @@ -0,0 +1,2 @@ +otbr-agent +otbr-agent.service \ No newline at end of file diff --git a/src/web/.gitignore b/src/web/.gitignore new file mode 100644 index 00000000000..67b3fac5fdf --- /dev/null +++ b/src/web/.gitignore @@ -0,0 +1,2 @@ +otbr-web +otbr-web.service diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 00000000000..750e57ce2dc --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +.deps +*.o diff --git a/tests/mdns/.gitignore b/tests/mdns/.gitignore new file mode 100644 index 00000000000..2675a34e01b --- /dev/null +++ b/tests/mdns/.gitignore @@ -0,0 +1 @@ +otbr-test-mdns diff --git a/tests/meshcop/.gitignore b/tests/meshcop/.gitignore new file mode 100644 index 00000000000..ef5b0d945a8 --- /dev/null +++ b/tests/meshcop/.gitignore @@ -0,0 +1 @@ +otbr-commissioner diff --git a/third_party/.gitignore b/third_party/.gitignore new file mode 100644 index 00000000000..27370b71e04 --- /dev/null +++ b/third_party/.gitignore @@ -0,0 +1,4 @@ +# To avoid these "ignores" from being recursive +# these ignores start with a leading / +/Makefile +/Makefile.in diff --git a/third_party/Simple-web-server/.gitignore b/third_party/Simple-web-server/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/third_party/Simple-web-server/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/third_party/angular-material/.gitignore b/third_party/angular-material/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/third_party/angular-material/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/third_party/angular/.gitignore b/third_party/angular/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/third_party/angular/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/third_party/libcoap/.gitignore b/third_party/libcoap/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/third_party/libcoap/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/third_party/mbedtls/.gitignore b/third_party/mbedtls/.gitignore new file mode 100644 index 00000000000..97667498b1b --- /dev/null +++ b/third_party/mbedtls/.gitignore @@ -0,0 +1,7 @@ +/Makefile +/Makefile.in +/.libs +/libmbedtls.la +/repo/library/.deps/ +/repo/library/.dirstamp + diff --git a/third_party/mdl/.gitignore b/third_party/mdl/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/third_party/mdl/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/third_party/wpantund/.gitignore b/third_party/wpantund/.gitignore new file mode 100644 index 00000000000..17cae714dbb --- /dev/null +++ b/third_party/wpantund/.gitignore @@ -0,0 +1,5 @@ +/Makefile +/Makefile.in +/.libs +/wpantund.service +/libwpanctl.la diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000000..8a6642eb971 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,6 @@ +.deps +Makefile +Makefile.in +pskc +*.o + From f2b42c7819a77bb4a9330cf2ad84df7ef65142e8 Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Fri, 28 Jul 2017 15:57:46 -0700 Subject: [PATCH 2/8] Missing terminal newline --- src/agent/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/.gitignore b/src/agent/.gitignore index 1dfc5e8fc64..e45e292203a 100644 --- a/src/agent/.gitignore +++ b/src/agent/.gitignore @@ -1,2 +1,2 @@ otbr-agent -otbr-agent.service \ No newline at end of file +otbr-agent.service From 84df214ace3e359ac912de909ac0fa936c58edbd Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Mon, 31 Jul 2017 08:11:14 -0700 Subject: [PATCH 3/8] Per request, single .gitignore --- .gitignore | 89 +++++++++++++++++++----- doc/.gitignore | 6 -- include/.gitignore | 5 -- src/.gitignore | 9 --- src/agent/.gitignore | 2 - src/web/.gitignore | 2 - tests/.gitignore | 4 -- tests/mdns/.gitignore | 1 - tests/meshcop/.gitignore | 1 - third_party/.gitignore | 4 -- third_party/Simple-web-server/.gitignore | 2 - third_party/angular-material/.gitignore | 2 - third_party/angular/.gitignore | 2 - third_party/libcoap/.gitignore | 2 - third_party/mbedtls/.gitignore | 7 -- third_party/mdl/.gitignore | 2 - third_party/wpantund/.gitignore | 5 -- tools/.gitignore | 6 -- 18 files changed, 71 insertions(+), 80 deletions(-) delete mode 100644 doc/.gitignore delete mode 100644 include/.gitignore delete mode 100644 src/.gitignore delete mode 100644 src/agent/.gitignore delete mode 100644 src/web/.gitignore delete mode 100644 tests/.gitignore delete mode 100644 tests/mdns/.gitignore delete mode 100644 tests/meshcop/.gitignore delete mode 100644 third_party/.gitignore delete mode 100644 third_party/Simple-web-server/.gitignore delete mode 100644 third_party/angular-material/.gitignore delete mode 100644 third_party/angular/.gitignore delete mode 100644 third_party/libcoap/.gitignore delete mode 100644 third_party/mbedtls/.gitignore delete mode 100644 third_party/mdl/.gitignore delete mode 100644 third_party/wpantund/.gitignore delete mode 100644 tools/.gitignore diff --git a/.gitignore b/.gitignore index a5cb7a8a6f8..88320368498 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,78 @@ -# To avoid recursively ignoring things in thirdparty -# most of these start with a / -/Makefile.in -/Makefile -/aclocal.m4 -/autom4te.cache/ -/configure -/config.log -/config.status -/libtool -/.local-version -/._build - -# This is for EMACS lock file, the [] escapes the # comment char. -[#]*[#] -.[#]* -# Standard editor backup files +# Emacs lock/links on linux +.[#]* +# Emacs backups (windows) +[#]*[#] +# emacs backups *~ +# Generic editor backups *.bak +# Objects & libraries +*.[ao] +*.l[ao] +*.so +*.swp + +# Autoconf +m4 +aclocal.m4 +autom4te.cache +config.h.in +config.log +config.status +configure +libtool +Makefile +Makefile.in + +# Build inside border router of wpantund +._build + + +# Build bi-products. +.local-version +.deps +.libs +.dirstamp +stamp-h1 +.stamp-h1 + +# Border Router Docs +doc/Doxyfile +doc/html + +# Debugger stuff. +.gdb_history +.gdbinit -# VIM + +# Configure results for border router +include/otbr-config.h +include/otbr-config.h.in + + + +# VIM swap files [._]*.s[a-w][a-z] [._]s[a-w][a-z] + +# Border router agent +src/agent/otbr-agent +src/agent/otbr-agent.service + +# Border router web service +src/web/otbr-web +src/web/otbr-web.service + +# Test code. +tests/mdns/otbr-test-mdns +tests/meshcop/otbr-commissioner +tests/testdriver + +# all things here. +third_party/mbedtls/repo +third_party/wpantund/wpantund.service + +# Tools +tools/pskc diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 35702cbff8c..00000000000 --- a/doc/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -html -Doxyfile - - diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 90d6e0bafa7..00000000000 --- a/include/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -otbr-config.h -otbr-config.h.in -stamp-h1 diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index d559ac29f99..00000000000 --- a/src/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -.dirstamp -*.o -*.la -*.lo - diff --git a/src/agent/.gitignore b/src/agent/.gitignore deleted file mode 100644 index e45e292203a..00000000000 --- a/src/agent/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -otbr-agent -otbr-agent.service diff --git a/src/web/.gitignore b/src/web/.gitignore deleted file mode 100644 index 67b3fac5fdf..00000000000 --- a/src/web/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -otbr-web -otbr-web.service diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 750e57ce2dc..00000000000 --- a/tests/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*.o diff --git a/tests/mdns/.gitignore b/tests/mdns/.gitignore deleted file mode 100644 index 2675a34e01b..00000000000 --- a/tests/mdns/.gitignore +++ /dev/null @@ -1 +0,0 @@ -otbr-test-mdns diff --git a/tests/meshcop/.gitignore b/tests/meshcop/.gitignore deleted file mode 100644 index ef5b0d945a8..00000000000 --- a/tests/meshcop/.gitignore +++ /dev/null @@ -1 +0,0 @@ -otbr-commissioner diff --git a/third_party/.gitignore b/third_party/.gitignore deleted file mode 100644 index 27370b71e04..00000000000 --- a/third_party/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# To avoid these "ignores" from being recursive -# these ignores start with a leading / -/Makefile -/Makefile.in diff --git a/third_party/Simple-web-server/.gitignore b/third_party/Simple-web-server/.gitignore deleted file mode 100644 index b336cc7cec9..00000000000 --- a/third_party/Simple-web-server/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/third_party/angular-material/.gitignore b/third_party/angular-material/.gitignore deleted file mode 100644 index b336cc7cec9..00000000000 --- a/third_party/angular-material/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/third_party/angular/.gitignore b/third_party/angular/.gitignore deleted file mode 100644 index b336cc7cec9..00000000000 --- a/third_party/angular/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/third_party/libcoap/.gitignore b/third_party/libcoap/.gitignore deleted file mode 100644 index b336cc7cec9..00000000000 --- a/third_party/libcoap/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/third_party/mbedtls/.gitignore b/third_party/mbedtls/.gitignore deleted file mode 100644 index 97667498b1b..00000000000 --- a/third_party/mbedtls/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Makefile -/Makefile.in -/.libs -/libmbedtls.la -/repo/library/.deps/ -/repo/library/.dirstamp - diff --git a/third_party/mdl/.gitignore b/third_party/mdl/.gitignore deleted file mode 100644 index b336cc7cec9..00000000000 --- a/third_party/mdl/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/third_party/wpantund/.gitignore b/third_party/wpantund/.gitignore deleted file mode 100644 index 17cae714dbb..00000000000 --- a/third_party/wpantund/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/Makefile -/Makefile.in -/.libs -/wpantund.service -/libwpanctl.la diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index 8a6642eb971..00000000000 --- a/tools/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -Makefile -Makefile.in -pskc -*.o - From 972f0a933a912769d4a14755d0f4e1d258adde85 Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Sun, 13 Aug 2017 20:22:02 -0700 Subject: [PATCH 4/8] BUG, UDP messages lost during relay operation --- src/agent/dtls_mbedtls.cpp | 30 +++++++++++++++++++++++------- src/agent/dtls_mbedtls.hpp | 1 + 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/agent/dtls_mbedtls.cpp b/src/agent/dtls_mbedtls.cpp index 709e81ec0af..2aba00a81ad 100644 --- a/src/agent/dtls_mbedtls.cpp +++ b/src/agent/dtls_mbedtls.cpp @@ -455,11 +455,14 @@ void MbedtlsServer::UpdateFdSet(fd_set &aReadFdSet, fd_set &aWriteFdSet, fd_set } } - FD_SET(mSocket, &aReadFdSet); - - if (aMaxFd < mSocket) - { - aMaxFd = mSocket; + if( mSocket >= 0 ){ + FD_SET(mSocket, &aReadFdSet); + + if (aMaxFd < mSocket) + { + log_printf("mbed server mSocket is larger: %d\n", mSocket ); + aMaxFd = mSocket; + } } aTimeout.tv_sec = timeout / 1000; @@ -482,13 +485,25 @@ 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 */ + if( mSocket < 0 ) + { + /* there is not error */ + ExitNow(error = OTBR_ERROR_NONE); + } + + /* If this is nto set, then some other handle became rd/wr able. */ + if( !FD_ISSET(mSocket,&aReadFdSet) ) + { + /* this is not an error */ + ExitNow(error = OTBR_ERROR_NONE); + } otbrLog(OTBR_LOG_INFO, "Trying to accept connection..."); memset(&src, 0, sizeof(src)); @@ -540,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()) { diff --git a/src/agent/dtls_mbedtls.hpp b/src/agent/dtls_mbedtls.hpp index 7deaea9e5f8..30f2986f4c5 100644 --- a/src/agent/dtls_mbedtls.hpp +++ b/src/agent/dtls_mbedtls.hpp @@ -221,6 +221,7 @@ class MbedtlsServer : public Server * */ MbedtlsServer(uint16_t aPort, StateHandler aStateHandler, void *aContext) : + mSocket(-1), mPort(aPort), mStateHandler(aStateHandler), mContext(aContext) {} From f28e31dff245734baacfbf02962167ec38bd1329 Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Sun, 13 Aug 2017 22:00:14 -0700 Subject: [PATCH 5/8] Remove old logging code --- src/agent/dtls_mbedtls.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/agent/dtls_mbedtls.cpp b/src/agent/dtls_mbedtls.cpp index 2aba00a81ad..b181cfa445e 100644 --- a/src/agent/dtls_mbedtls.cpp +++ b/src/agent/dtls_mbedtls.cpp @@ -460,7 +460,6 @@ void MbedtlsServer::UpdateFdSet(fd_set &aReadFdSet, fd_set &aWriteFdSet, fd_set if (aMaxFd < mSocket) { - log_printf("mbed server mSocket is larger: %d\n", mSocket ); aMaxFd = mSocket; } } From b2cdc8ab06106b5f910b256558ac15c4226d247c Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Tue, 15 Aug 2017 08:46:19 -0700 Subject: [PATCH 6/8] make pretty --- src/agent/dtls_mbedtls.cpp | 23 ++++++++++++----------- src/agent/dtls_mbedtls.hpp | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/agent/dtls_mbedtls.cpp b/src/agent/dtls_mbedtls.cpp index b181cfa445e..e864585ea43 100644 --- a/src/agent/dtls_mbedtls.cpp +++ b/src/agent/dtls_mbedtls.cpp @@ -455,13 +455,14 @@ void MbedtlsServer::UpdateFdSet(fd_set &aReadFdSet, fd_set &aWriteFdSet, fd_set } } - if( mSocket >= 0 ){ - FD_SET(mSocket, &aReadFdSet); + if (mSocket >= 0) + { + FD_SET(mSocket, &aReadFdSet); - if (aMaxFd < mSocket) - { + if (aMaxFd < mSocket) + { aMaxFd = mSocket; - } + } } aTimeout.tv_sec = timeout / 1000; @@ -491,17 +492,17 @@ void MbedtlsServer::ProcessServer(const fd_set &aReadFdSet, const fd_set &aWrite struct iovec iov[1]; /* Connection is not alive yet, or is shut down */ - if( mSocket < 0 ) + if (mSocket < 0) { - /* there is not error */ - ExitNow(error = OTBR_ERROR_NONE); + /* there is not error */ + ExitNow(error = OTBR_ERROR_NONE); } /* If this is nto set, then some other handle became rd/wr able. */ - if( !FD_ISSET(mSocket,&aReadFdSet) ) + if (!FD_ISSET(mSocket, &aReadFdSet)) { - /* this is not an error */ - ExitNow(error = OTBR_ERROR_NONE); + /* this is not an error */ + ExitNow(error = OTBR_ERROR_NONE); } otbrLog(OTBR_LOG_INFO, "Trying to accept connection..."); diff --git a/src/agent/dtls_mbedtls.hpp b/src/agent/dtls_mbedtls.hpp index 30f2986f4c5..1bd8f61cfb2 100644 --- a/src/agent/dtls_mbedtls.hpp +++ b/src/agent/dtls_mbedtls.hpp @@ -221,7 +221,7 @@ class MbedtlsServer : public Server * */ MbedtlsServer(uint16_t aPort, StateHandler aStateHandler, void *aContext) : - mSocket(-1), + mSocket(-1), mPort(aPort), mStateHandler(aStateHandler), mContext(aContext) {} From 78c5150b9c50c2d5a28a9d7c5a2e8601d5529495 Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Tue, 15 Aug 2017 17:58:06 -0700 Subject: [PATCH 7/8] Per review comments. --- src/agent/dtls_mbedtls.cpp | 14 +++----------- tests/meshcop/commissioner.cpp | 1 + 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/agent/dtls_mbedtls.cpp b/src/agent/dtls_mbedtls.cpp index c7fe7988dee..afb4861a169 100644 --- a/src/agent/dtls_mbedtls.cpp +++ b/src/agent/dtls_mbedtls.cpp @@ -496,18 +496,10 @@ void MbedtlsServer::ProcessServer(const fd_set &aReadFdSet, const fd_set &aWrite struct iovec iov[1]; /* Connection is not alive yet, or is shut down */ - if (mSocket < 0) - { - /* there is not error */ - ExitNow(error = OTBR_ERROR_NONE); - } + VerifyOrExit(mSocket >= 0, error = OTBR_ERROR_NONE); - /* If this is nto set, then some other handle became rd/wr able. */ - if (!FD_ISSET(mSocket, &aReadFdSet)) - { - /* this is not an error */ - ExitNow(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); otbrLog(OTBR_LOG_INFO, "Trying to accept connection..."); memset(&src, 0, sizeof(src)); diff --git a/tests/meshcop/commissioner.cpp b/tests/meshcop/commissioner.cpp index 36097eff178..717fd4b1e5d 100644 --- a/tests/meshcop/commissioner.cpp +++ b/tests/meshcop/commissioner.cpp @@ -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(kPSKd))); + aContext.mDtlsServer->Start(); while (aContext.mState != kStateDone && aContext.mState != kStateError) { From 69d8ad020fb1f203fd6ddae42c59666c365e3d02 Mon Sep 17 00:00:00 2001 From: Duane Ellis Date: Tue, 15 Aug 2017 18:02:25 -0700 Subject: [PATCH 8/8] Nit fix, space --- src/agent/dtls_mbedtls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/dtls_mbedtls.cpp b/src/agent/dtls_mbedtls.cpp index afb4861a169..d4a1c740779 100644 --- a/src/agent/dtls_mbedtls.cpp +++ b/src/agent/dtls_mbedtls.cpp @@ -499,7 +499,7 @@ void MbedtlsServer::ProcessServer(const fd_set &aReadFdSet, const fd_set &aWrite 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); + VerifyOrExit(FD_ISSET(mSocket, &aReadFdSet), error = OTBR_ERROR_NONE); otbrLog(OTBR_LOG_INFO, "Trying to accept connection..."); memset(&src, 0, sizeof(src));