Enable defines (#1877)

* Add dhcp6 client define, and update openthred-config include scheme

* #1663 - update include to use quotes instead of angle brackets

* #1663 - update file to use underscore instead of dash

* #1663 - remove extra space

* #1663 - update location of new header file and update files to point to it

* #1663 - update location of new header file and update files to point to it

* #1663 update makefile.am to include new header

* update for make pretty changes

* more pretty fixes

* cleanup, and remove automatic mbedtls change

* remove debugging change

* #1663 - Remove extra space, and change include to use angle brackets instead of quotes.

* rename the enable defines file to openthred_config

* #1663 clean up for code review

* #1663 - clean up last nits

* #1663 - missed merge conflicts - file openthread-config.h -> openthread/openthread_config.h

configure.ac

@@ -85,7 +85,7 @@ AC_CONFIG_MACRO_DIR([third_party/nlbuild-autotools/repo/autoconf/m4])
 # Tell autoconf what file the package is using to aggregate C preprocessor
 # defines.
 #
-AC_CONFIG_HEADERS([include/openthread-config.h])
+AC_CONFIG_HEADERS([include/openthread-config-generic.h])
 
 #
 # Figure out what the canonical build and host tuples are.

examples/apps/cli/main.c

@@ -26,11 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <assert.h>
 

examples/apps/ncp/main.c

@@ -26,11 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <assert.h>
 

examples/platforms/cc2538/alarm.c

@@ -35,7 +35,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/openthread.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/diag.h>

examples/platforms/cc2538/diag.c

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/openthread.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/radio.h>

examples/platforms/cc2538/flash.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/platform/alarm.h>
 
 #include "platform-cc2538.h"

examples/platforms/cc2538/radio.c

@@ -32,7 +32,7 @@
  *
  */
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/openthread.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/platform.h>

examples/platforms/da15000/alarm.c

@@ -31,11 +31,7 @@
 * Platform abstraction for the alarm
 */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <stdbool.h>
 #include <stdint.h>

examples/platforms/da15000/flash.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/types.h>
 #include <openthread/platform/alarm.h>
 

examples/platforms/da15000/uart.c

@@ -26,11 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <assert.h>
 #include <fcntl.h>

examples/platforms/efr32/alarm.c

@@ -35,7 +35,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/platform.h>

examples/platforms/efr32/diag.c

@@ -37,7 +37,7 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/radio.h>
 

examples/platforms/efr32/flash.c

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread platform abstraction for the non-volatile storage.
  */
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/platform/alarm.h>
 
 #include "utils/code_utils.h"

examples/platforms/efr32/logging.c

@@ -32,11 +32,7 @@
  *
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <openthread/cli.h>
 #include <openthread/platform/logging.h>

examples/platforms/efr32/radio.c

@@ -35,7 +35,7 @@
 #include <assert.h>
 
 #include <openthread/types.h>
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/platform/platform.h>
 #include <openthread/platform/radio.h>
 #include <openthread/platform/diag.h>

examples/platforms/emsk/flash.c

@@ -32,7 +32,7 @@
  *
  */
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include "openthread/platform/alarm.h"
 #include <utils/flash.h>
 #include <utils/code_utils.h>

examples/platforms/kw41z/logging.c

@@ -35,12 +35,7 @@
 #include <stdint.h>
 #include "fsl_device_registers.h"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
-
+#include <openthread/config.h>
 
 #include "openthread/platform/logging.h"
 #if OPENTHREAD_ENABLE_CLI_LOGGING

examples/platforms/nrf52840/alarm.c

@@ -46,7 +46,7 @@
 #include "drivers/nrf_drv_clock.h"
 #include "hal/nrf_rtc.h"
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/types.h>
 
 #define RTC_FREQUENCY       32768ULL

examples/platforms/nrf52840/logging.c

@@ -42,7 +42,7 @@
 #include "platform-nrf5.h"
 
 #include <openthread-core-config.h>
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/types.h>
 
 #if (OPENTHREAD_CONFIG_ENABLE_DEFAULT_LOG_OUTPUT == 0)

examples/platforms/nrf52840/platform.c

@@ -38,7 +38,7 @@
 #include "platform-nrf5.h"
 
 #include <openthread-core-config.h>
-#include <openthread-config.h>
+#include <openthread/config.h>
 
 void __cxa_pure_virtual(void) { while (1); }
 

examples/platforms/nrf52840/radio.c

@@ -32,11 +32,7 @@
  *
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 // NRF tools use #define PACKAGE - for other purposes
 // ie: the physical package the chip comes in
 // This conflicts with the GNU Autoconf "PACAKGE" define
@@ -58,7 +54,7 @@
 #include "drivers/nrf_drv_radio802154.h"
 
 #include <openthread-core-config.h>
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/types.h>
 
 #define SHORT_ADDRESS_SIZE    2

examples/platforms/posix/diag.c

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 #include <openthread/openthread.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/radio.h>

examples/platforms/posix/flash.c

@@ -35,7 +35,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <openthread-config.h>
+#include <openthread/config.h>
 
 #include "utils/code_utils.h"
 #include "utils/flash.h"

examples/platforms/posix/platform-posix.h

@@ -35,11 +35,7 @@
 #ifndef PLATFORM_POSIX_H_
 #define PLATFORM_POSIX_H_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <assert.h>
 #include <stdlib.h>

include/openthread/Makefile.am

@@ -51,6 +51,7 @@ openthread_headers                      = \
     cli.h                                 \
     coap.h                                \
     commissioner.h                        \
+    config.h                              \
     crypto.h                              \
     border_router.h                       \
     dataset.h                             \

include/openthread/child_supervision.h

@@ -35,11 +35,7 @@
 #ifndef OPENTHREAD_CHILD_SUPERVISION_H_
 #define OPENTHREAD_CHILD_SUPERVISION_H_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "openthread/types.h"
 

include/openthread/coap.h

@@ -35,11 +35,7 @@
 #ifndef OPENTHREAD_COAP_H_
 #define OPENTHREAD_COAP_H_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <stdint.h>
 

include/openthread/config.h

@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2017, 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.
+ */
+
+/**
+ * @file
+ * @brief
+ *  This file includes required defines config header.
+ */
+
+#ifndef OPENTHREAD_CONFIG_H_
+#define OPENTHREAD_CONFIG_H_
+
+#if !defined(OPENTHREAD_CONFIG_FILE)
+#define OPENTHREAD_CONFIG_FILE <openthread-config-generic.h>
+#endif
+
+#include OPENTHREAD_CONFIG_FILE
+
+#endif //OPENTHREAD_CONFIG_H_
+
+
+

include/openthread/dns.h

@@ -35,11 +35,7 @@
 #ifndef OPENTHREAD_DNS_H_
 #define OPENTHREAD_DNS_H_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <openthread/message.h>
 #include <openthread/types.h>

include/openthread/jam_detection.h

@@ -35,11 +35,7 @@
 #ifndef OPENTHREAD_JAM_DETECTION_H_
 #define OPENTHREAD_JAM_DETECTION_H_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <openthread/types.h>
 

include/openthread/tmf_proxy.h

@@ -35,11 +35,7 @@
 #ifndef OPENTHREAD_TMF_PROXY_H_
 #define OPENTHREAD_TMF_PROXY_H_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <openthread/types.h>
 

src/cli/cli.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CLI interpreter.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "cli.hpp"
 

src/cli/cli.hpp

@@ -34,11 +34,7 @@
 #ifndef CLI_HPP_
 #define CLI_HPP_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <stdarg.h>
 

src/cli/cli_coap.cpp

@@ -31,11 +31,7 @@
  *   This file implements a simple CLI for the CoAP service.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #if OPENTHREAD_ENABLE_APPLICATION_COAP
 

src/cli/cli_console.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CLI server on the CONSOLE service.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "cli_console.hpp"
 

src/cli/cli_dataset.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CLI interpreter.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "cli_dataset.hpp"
 

src/cli/cli_instance.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CLI interpreter Instance related functions.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <assert.h>
 #include <stdio.h>

src/cli/cli_uart.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CLI server on the UART service.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "cli_uart.hpp"
 

src/cli/cli_udp.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CLI server on a UDP socket.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "cli_udp.hpp"
 

src/core/api/border_router_api.cpp

@@ -31,11 +31,7 @@
  *   This file implements the OpenThread Border Router API.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #if OPENTHREAD_ENABLE_BORDER_ROUTER
 

src/core/api/coap_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread CoAP API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/coap.h>
 
 #include "openthread-instance.h"

src/core/api/commissioner_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread Commissioner API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/commissioner.h>
 
 #include "openthread-instance.h"

src/core/api/crypto_api.cpp

@@ -31,6 +31,7 @@
  *   This file implements the OpenThread Crypto API.
  */
 
+#include <openthread/config.h>
 #include <openthread/crypto.h>
 
 #include "common/code_utils.hpp"

src/core/api/dataset_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread Operational Dataset API (for both FTD and MTD).
  */
 
+#include <openthread/config.h>
+
 #include <openthread/dataset.h>
 
 #include "openthread-instance.h"

src/core/api/dataset_ftd_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread Operational Dataset API (FTD only).
  */
 
+#include <openthread/config.h>
+
 #if OPENTHREAD_FTD
 
 #include <openthread/dataset_ftd.h>

src/core/api/dhcp6_api.cpp

@@ -31,7 +31,9 @@
  *   This file implements the OpenThread DHCPv6 API.
  */
 
+#include <openthread/config.h>
 #include <openthread/dhcp6_client.h>
+
 #include <openthread/dhcp6_server.h>
 
 #include "openthread-instance.h"

src/core/api/dns_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread UDP API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/dns.h>
 
 #include "openthread-instance.h"

src/core/api/icmp6_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread ICMPv6 API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/icmp6.h>
 
 #include "openthread-instance.h"

src/core/api/instance_api.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "instance_api.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <openthread/instance.h>
 #include <openthread/platform/misc.h>

src/core/api/ip6_api.cpp

@@ -33,6 +33,8 @@
 
 #define WPP_NAME "ip6_api.tmh"
 
+#include <openthread/config.h>
+
 #include <openthread/ip6.h>
 
 #include "openthread-instance.h"

src/core/api/jam_detection_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread Jam Detection API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/jam_detection.h>
 
 #include "openthread-instance.h"

src/core/api/joiner_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread Joiner API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/joiner.h>
 
 #include "openthread-instance.h"

src/core/api/link_api.cpp

@@ -31,6 +31,8 @@
  *   This file implements the OpenThread Link API.
  */
 
+#include <openthread/config.h>
+
 #include <openthread/link.h>
 
 #include "openthread-instance.h"

src/core/api/link_raw_api.cpp

@@ -31,12 +31,13 @@
  *   This file implements the OpenThread Link Raw API.
  */
 
+#include <openthread/config.h>
+#include <common/debug.hpp>
+#include <common/logging.hpp>
 #include <openthread/platform/random.h>
 #include <openthread/platform/usec-alarm.h>
 
 #include "openthread-instance.h"
-#include "common/debug.hpp"
-#include "common/logging.hpp"
 
 #if OPENTHREAD_ENABLE_RAW_LINK_API
 

src/core/api/message_api.cpp

@@ -30,6 +30,7 @@
  * @file
  *   This file implements the OpenThread Message API.
  */
+#include <openthread/config.h>
 
 #include <openthread/message.h>
 

src/core/api/netdata_api.cpp

@@ -30,6 +30,7 @@
  * @file
  *   This file implements the OpenThread Network Data API.
  */
+#include <openthread/config.h>
 
 #include <openthread/netdata.h>
 

src/core/api/tasklet_api.cpp

@@ -33,6 +33,7 @@
 
 #define WPP_NAME "tasklet_api.tmh"
 
+#include <openthread/config.h>
 #include <openthread/tasklet.h>
 
 #include "openthread-instance.h"

src/core/api/thread_api.cpp

@@ -33,6 +33,8 @@
 
 #define WPP_NAME "thread_api.tmh"
 
+#include <openthread/config.h>
+
 #include <openthread/thread.h>
 #include <openthread/platform/settings.h>
 

src/core/api/thread_ftd_api.cpp

@@ -33,16 +33,11 @@
 
 #define WPP_NAME "thread_ftd_api.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #if OPENTHREAD_FTD
 
 #include <openthread/thread_ftd.h>
-
 #include "openthread-core-config.h"
 #include "openthread-instance.h"
 

src/core/api/tmf_proxy_api.cpp

@@ -31,6 +31,7 @@
  *   This file implements the OpenThread TMF proxy API.
  */
 
+#include <openthread/config.h>
 #include <openthread/tmf_proxy.h>
 
 #include "openthread-instance.h"

src/core/api/udp_api.cpp

@@ -31,6 +31,7 @@
  *   This file implements the OpenThread UDP API.
  */
 
+#include <openthread/config.h>
 #include <openthread/udp.h>
 
 #include "openthread-instance.h"

src/core/coap/coap.cpp

@@ -28,11 +28,7 @@
 
 #define WPP_NAME "coap.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "coap.hpp"
 

src/core/coap/coap_header.cpp

@@ -31,11 +31,7 @@
  *   This file implements the CoAP header generation and parsing.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "coap_header.hpp"
 

src/core/coap/coap_secure.cpp

@@ -28,11 +28,7 @@
 
 #define WPP_NAME "coap_secure.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "coap_secure.hpp"
 

src/core/common/crc16.cpp

@@ -31,11 +31,7 @@
  *   This file implements CRC16 computations.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "crc16.hpp"
 

src/core/common/logging.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "logging.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "logging.hpp"
 

src/core/common/logging.hpp

@@ -34,6 +34,8 @@
 #ifndef LOGGING_HPP_
 #define LOGGING_HPP_
 
+#include <openthread/config.h>
+
 #include <ctype.h>
 #include <stdio.h>
 #include "utils/wrap_string.h"

src/core/common/message.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "message.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "message.hpp"
 

src/core/common/message.hpp

@@ -34,11 +34,7 @@
 #ifndef MESSAGE_HPP_
 #define MESSAGE_HPP_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "utils/wrap_stdint.h"
 #include "utils/wrap_string.h"

src/core/common/tasklet.cpp

@@ -31,11 +31,7 @@
  *   This file implements the tasklet scheduler.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "tasklet.hpp"
 

src/core/common/timer.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "timer.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "timer.hpp"
 

src/core/common/tlvs.cpp

@@ -31,11 +31,7 @@
  *   This file implements common methods for manipulating MLE TLVs.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "tlvs.hpp"
 

src/core/common/trickle_timer.cpp

@@ -31,11 +31,7 @@
  *   This file implements the trickle timer logic.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "trickle_timer.hpp"
 

src/core/crypto/aes_ccm.cpp

@@ -31,11 +31,7 @@
  *   This file implements AES-CCM.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "aes_ccm.hpp"
 

src/core/crypto/aes_ecb.cpp

@@ -31,11 +31,7 @@
  *   This file implements AES-ECB.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "aes_ecb.hpp"
 

src/core/crypto/hmac_sha256.cpp

@@ -31,11 +31,7 @@
  *   This file implements HMAC SHA-256.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "hmac_sha256.hpp"
 

src/core/crypto/mbedtls.cpp

@@ -31,11 +31,7 @@
  *   This file implements the use of mbedTLS.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "mbedtls.hpp"
 

src/core/crypto/mbedtls.hpp

@@ -34,11 +34,7 @@
 #ifndef OT_MBEDTLS_HPP_
 #define OT_MBEDTLS_HPP_
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <mbedtls/memory_buffer_alloc.h>
 

src/core/crypto/pbkdf2_cmac.cpp

@@ -31,11 +31,7 @@
  *   This file implements PBKDF2 using AES-CMAC-PRF-128
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "pbkdf2_cmac.h"
 

src/core/crypto/sha256.cpp

@@ -31,11 +31,7 @@
  *   This file implements SHA-256.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "sha256.hpp"
 

src/core/mac/mac.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "mac.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "mac.hpp"
 

src/core/mac/mac_blacklist.cpp

@@ -31,11 +31,7 @@
  *   This file implements blacklist IEEE 802.15.4 frame filtering based on MAC address.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "mac_blacklist.hpp"
 

src/core/mac/mac_blacklist.hpp

@@ -26,11 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #if OPENTHREAD_ENABLE_MAC_WHITELIST
 #include "mac_blacklist_impl.hpp"

src/core/mac/mac_frame.cpp

@@ -31,11 +31,7 @@
  *   This file implements IEEE 802.15.4 header generation and processing.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "mac_frame.hpp"
 

src/core/mac/mac_whitelist.cpp

@@ -31,11 +31,7 @@
  *   This file implements whitelist IEEE 802.15.4 frame filtering based on MAC address.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "mac_whitelist.hpp"
 

src/core/mac/mac_whitelist.hpp

@@ -26,11 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #if OPENTHREAD_ENABLE_MAC_WHITELIST
 #include "mac_whitelist_impl.hpp"

src/core/meshcop/announce_begin_client.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "announce_begin_client.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "announce_begin_client.hpp"
 

src/core/meshcop/commissioner.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "commissioner.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "commissioner.hpp"
 

src/core/meshcop/dataset.cpp

@@ -32,11 +32,7 @@
  *
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "dataset.hpp"
 

src/core/meshcop/dataset_manager.cpp

@@ -34,11 +34,7 @@
 
 #define WPP_NAME "dataset_manager.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "dataset_manager.hpp"
 

src/core/meshcop/dataset_manager_ftd.cpp

@@ -36,11 +36,7 @@
 
 #define WPP_NAME "dataset_manager.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include <stdio.h>
 

src/core/meshcop/dtls.cpp

@@ -32,12 +32,7 @@
  */
 
 #define WPP_NAME "dtls.tmh"
-
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "dtls.hpp"
 

src/core/meshcop/energy_scan_client.cpp

@@ -32,12 +32,7 @@
  */
 
 #define WPP_NAME "energy_scan_client.tmh"
-
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "energy_scan_client.hpp"
 

src/core/meshcop/joiner.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "joiner.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "joiner.hpp"
 

src/core/meshcop/joiner_router.cpp

@@ -35,11 +35,7 @@
 
 #define WPP_NAME "joiner_router.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "joiner_router.hpp"
 

src/core/meshcop/leader.cpp

@@ -35,11 +35,7 @@
 
 #define WPP_NAME "leader.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "leader.hpp"
 

src/core/meshcop/panid_query_client.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "panid_query_client.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "panid_query_client.hpp"
 

src/core/meshcop/timestamp.cpp

@@ -31,11 +31,7 @@
  *   This file implements common MeshCoP timestamp processing.
  */
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "timestamp.hpp"
 

src/core/net/dhcp6_client.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "dhcp6_client.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "dhcp6_client.hpp"
 
@@ -51,6 +47,9 @@
 #include "net/dhcp6.hpp"
 #include "thread/thread_netif.hpp"
 
+
+#if OPENTHREAD_ENABLE_DHCP6_CLIENT
+
 using ot::Encoding::BigEndian::HostSwap16;
 using ot::Encoding::BigEndian::HostSwap32;
 
@@ -725,3 +724,6 @@ exit:
 
 }  // namespace Dhcp6
 }  // namespace ot
+
+#endif //OPENTHREAD_ENABLE_DHCP6_CLIENT
+

src/core/net/dhcp6_server.cpp

@@ -33,11 +33,7 @@
 
 #define WPP_NAME "dhcp6_server.tmh"
 
-#ifdef OPENTHREAD_CONFIG_FILE
-#include OPENTHREAD_CONFIG_FILE
-#else
-#include <openthread-config.h>
-#endif
+#include <openthread/config.h>
 
 #include "dhcp6_server.hpp"