[commissioner] move commissioner to src (#195)

openthread · Sep 18, 2018 · 1c39f91 · 1c39f91
1 parent da2f254
commit 1c39f91
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 45 deletions.
diff --git a/configure.ac b/configure.ac
@@ -440,9 +440,10 @@ third_party/angular-material/Makefile
 include/Makefile
 src/Makefile
 src/agent/Makefile
-src/web/Makefile
+src/commissioner/Makefile
 src/common/Makefile
 src/utils/Makefile
+src/web/Makefile
 tests/Makefile
 tests/mdns/Makefile
 tests/meshcop/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -32,9 +32,10 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
 DIST_SUBDIRS                                         = \
     agent                                              \
-    web                                                \
+    commissioner                                       \
     common                                             \
     utils                                              \
+    web                                                \
     $(NULL)
 
 # Always build (e.g. for 'make all') these subdirectories.
@@ -44,16 +45,18 @@ SUBDIRS                                              = \
     utils                                              \
     agent                                              \
     web                                                \
+    commissioner                                       \
     $(NULL)
 
 
 # Always pretty (e.g. for 'make pretty') these subdirectories.
 
 PRETTY_SUBDIRS                                       = \
     agent                                              \
-    web                                                \
+    commissioner                                       \
     common                                             \
     utils                                              \
+    web                                                \
     $(NULL)
 
 include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/src/commissioner/Makefile.am b/src/commissioner/Makefile.am
@@ -0,0 +1,72 @@
+#
+#  Copyright (c) 2018, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
+
+bin_PROGRAMS = otbr-commissioner
+
+noinst_HEADERS                                        = \
+    addr_utils.hpp                                      \
+    commissioner.hpp                                    \
+    commissioner_argcargv.hpp                           \
+    commissioner_constants.hpp                          \
+    commissioner_utils.hpp                              \
+    device_hash.hpp                                     \
+    joiner_session.hpp                                  \
+    $(NULL)
+
+otbr_commissioner_SOURCES                             = \
+    addr_utils.cpp                                      \
+    commissioner.cpp                                    \
+    commissioner_argcargv.cpp                           \
+    device_hash.cpp                                     \
+    joiner_session.cpp                                  \
+    main.cpp                                            \
+    $(NULL)
+
+otbr_commissioner_CPPFLAGS                            = \
+    -DMBEDTLS_CONFIG_FILE='<config-thread.h>'           \
+    -I$(top_srcdir)/third_party/mbedtls/repo/configs    \
+    -I$(top_srcdir)/third_party/mbedtls/repo/include    \
+    -I$(top_srcdir)/src                                 \
+    -I$(top_srcdir)/src/agent                           \
+    -I$(top_srcdir)/src/web                             \
+    $(NULL)
+
+otbr_commissioner_LDADD                               = \
+    $(top_builddir)/src/agent/libotbr-agent.la          \
+    $(top_builddir)/src/utils/libutils.la               \
+    $(top_builddir)/src/web/libotbr-web.la              \
+    $(top_builddir)/src/common/libotbr-logging.la       \
+    $(NULL)
+
+otbr_commissioner_LDFLAGS                             = \
+    -static                                             \
+    $(NULL)
+
+include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/tests/meshcop/addr_utils.cpp → src/commissioner/addr_utils.cpp b/tests/meshcop/addr_utils.cpp → src/commissioner/addr_utils.cpp
diff --git a/tests/meshcop/addr_utils.hpp → src/commissioner/addr_utils.hpp b/tests/meshcop/addr_utils.hpp → src/commissioner/addr_utils.hpp
diff --git a/tests/meshcop/commissioner.cpp → src/commissioner/commissioner.cpp b/tests/meshcop/commissioner.cpp → src/commissioner/commissioner.cpp
@@ -33,6 +33,7 @@
 
 #include <vector>
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -613,6 +614,8 @@ int Commissioner::SendRelayTransmit(uint8_t *aBuf, size_t aLength)
     responseTlv->SetValue(mJoinerRouterLocator);
     responseTlv = responseTlv->GetNext();
 
+    assert(mJoinerSession != NULL);
+
     if (mJoinerSession->NeedAppendKek())
     {
         uint8_t kek[kKEKSize];

diff --git a/tests/meshcop/commissioner.hpp → src/commissioner/commissioner.hpp b/tests/meshcop/commissioner.hpp → src/commissioner/commissioner.hpp
diff --git a/tests/meshcop/commissioner_argcargv.cpp → src/commissioner/commissioner_argcargv.cpp b/tests/meshcop/commissioner_argcargv.cpp → src/commissioner/commissioner_argcargv.cpp
diff --git a/tests/meshcop/commissioner_argcargv.hpp → src/commissioner/commissioner_argcargv.hpp b/tests/meshcop/commissioner_argcargv.hpp → src/commissioner/commissioner_argcargv.hpp
diff --git a/tests/meshcop/commissioner_constants.hpp → src/commissioner/commissioner_constants.hpp b/tests/meshcop/commissioner_constants.hpp → src/commissioner/commissioner_constants.hpp
diff --git a/tests/meshcop/commissioner_utils.hpp → src/commissioner/commissioner_utils.hpp b/tests/meshcop/commissioner_utils.hpp → src/commissioner/commissioner_utils.hpp
diff --git a/tests/meshcop/device_hash.cpp → src/commissioner/device_hash.cpp b/tests/meshcop/device_hash.cpp → src/commissioner/device_hash.cpp
diff --git a/tests/meshcop/device_hash.hpp → src/commissioner/device_hash.hpp b/tests/meshcop/device_hash.hpp → src/commissioner/device_hash.hpp
diff --git a/tests/meshcop/joiner_session.cpp → src/commissioner/joiner_session.cpp b/tests/meshcop/joiner_session.cpp → src/commissioner/joiner_session.cpp
diff --git a/tests/meshcop/joiner_session.hpp → src/commissioner/joiner_session.hpp b/tests/meshcop/joiner_session.hpp → src/commissioner/joiner_session.hpp
diff --git a/tests/meshcop/main.cpp → src/commissioner/main.cpp b/tests/meshcop/main.cpp → src/commissioner/main.cpp
diff --git a/tests/meshcop/Makefile.am b/tests/meshcop/Makefile.am
@@ -28,47 +28,6 @@
 
 include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
-check_PROGRAMS = otbr-commissioner
-
-noinst_HEADERS                                        = \
-    addr_utils.hpp                                      \
-    commissioner.hpp                                    \
-    commissioner_argcargv.hpp                           \
-    commissioner_constants.hpp                          \
-    commissioner_utils.hpp                              \
-    device_hash.hpp                                     \
-    joiner_session.hpp                                  \
-    $(NULL)
-
-otbr_commissioner_SOURCES                             = \
-    addr_utils.cpp                                      \
-    commissioner.cpp                                    \
-    commissioner_argcargv.cpp                           \
-    device_hash.cpp                                     \
-    joiner_session.cpp                                  \
-    main.cpp                                            \
-    $(NULL)
-
-otbr_commissioner_CPPFLAGS                            = \
-    -DMBEDTLS_CONFIG_FILE='<config-thread.h>'           \
-    -I$(top_srcdir)/third_party/mbedtls/repo/configs    \
-    -I$(top_srcdir)/third_party/mbedtls/repo/include    \
-    -I$(top_srcdir)/src                                 \
-    -I$(top_srcdir)/src/agent                           \
-    -I$(top_srcdir)/src/web                             \
-    $(NULL)
-
-otbr_commissioner_LDADD                               = \
-    $(top_builddir)/src/agent/libotbr-agent.la          \
-    $(top_builddir)/src/utils/libutils.la               \
-    $(top_builddir)/src/web/libotbr-web.la              \
-    $(top_builddir)/src/common/libotbr-logging.la       \
-    $(NULL)
-
-otbr_commissioner_LDFLAGS                             = \
-    -static                                             \
-    $(NULL)
-
 dist_check_SCRIPTS                                    = \
     meshcop                                             \
     meshcop_ftd                                         \

diff --git a/tests/meshcop/meshcop b/tests/meshcop/meshcop
@@ -63,7 +63,7 @@ readonly WPANCTL_PATH="${STAGE_DIR}/usr/bin/${WPANCTL}"
 readonly WPANTUND_PATH="${STAGE_DIR}/usr/sbin/${WPANTUND}"
 readonly OT_NCP_PATH="${STAGE_DIR}/usr/bin/${OT_NCP}"
 readonly OT_CLI_PATH="${STAGE_DIR}/usr/bin/${OT_CLI}"
-readonly OTBR_COMMISSIONER_PATH="${ABS_TOP_BUILDDIR}/tests/meshcop/${OTBR_COMMISSIONER}"
+readonly OTBR_COMMISSIONER_PATH="${ABS_TOP_BUILDDIR}/src/commissioner/${OTBR_COMMISSIONER}"
 readonly OTBR_AGENT_PATH="${ABS_TOP_BUILDDIR}/src/agent/${OTBR_AGENT}"
 readonly OTBR_DBUS_CONF="${ABS_TOP_SRCDIR}/src/agent/otbr-agent.conf"