diff --git a/Android.mk b/Android.mk index 2fd3073df..acb148677 100644 --- a/Android.mk +++ b/Android.mk @@ -174,8 +174,8 @@ LOCAL_SRC_FILES := \ src/core/api/thread_api.cpp \ src/core/api/thread_ftd_api.cpp \ src/core/api/udp_api.cpp \ - src/core/backbone_router/leader.cpp \ - src/core/backbone_router/local.cpp \ + src/core/backbone_router/bbr_leader.cpp \ + src/core/backbone_router/bbr_local.cpp \ src/core/coap/coap.cpp \ src/core/coap/coap_message.cpp \ src/core/coap/coap_secure.cpp \ diff --git a/BUILD.gn b/BUILD.gn index 2002ac094..df3b616f5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -66,8 +66,8 @@ static_library("lib-ot-core") { "src/core/api/thread_api.cpp", "src/core/api/thread_ftd_api.cpp", "src/core/api/udp_api.cpp", - "src/core/backbone_router/leader.cpp", - "src/core/backbone_router/local.cpp", + "src/core/backbone_router/bbr_leader.cpp", + "src/core/backbone_router/bbr_local.cpp", "src/core/coap/coap.cpp", "src/core/coap/coap_message.cpp", "src/core/coap/coap_secure.cpp", diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 0c3afa675..a860e1e49 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -102,8 +102,8 @@ set(COMMON_SOURCES api/thread_api.cpp api/thread_ftd_api.cpp api/udp_api.cpp - backbone_router/leader.cpp - backbone_router/local.cpp + backbone_router/bbr_leader.cpp + backbone_router/bbr_local.cpp coap/coap.cpp coap/coap_message.cpp coap/coap_secure.cpp diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 7906bf245..aefdccd7f 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -144,8 +144,8 @@ SOURCES_COMMON = \ api/thread_api.cpp \ api/thread_ftd_api.cpp \ api/udp_api.cpp \ - backbone_router/leader.cpp \ - backbone_router/local.cpp \ + backbone_router/bbr_leader.cpp \ + backbone_router/bbr_local.cpp \ coap/coap.cpp \ coap/coap_message.cpp \ coap/coap_secure.cpp \ @@ -315,8 +315,8 @@ endif # OPENTHREAD_ENABLE_VENDOR_EXTENSION HEADERS_COMMON = \ openthread-core-config.h \ - backbone_router/leader.hpp \ - backbone_router/local.hpp \ + backbone_router/bbr_leader.hpp \ + backbone_router/bbr_local.hpp \ coap/coap.hpp \ coap/coap_message.hpp \ coap/coap_secure.hpp \ diff --git a/src/core/backbone_router/leader.cpp b/src/core/backbone_router/bbr_leader.cpp similarity index 99% rename from src/core/backbone_router/leader.cpp rename to src/core/backbone_router/bbr_leader.cpp index 5453f089e..09ad54553 100644 --- a/src/core/backbone_router/leader.cpp +++ b/src/core/backbone_router/bbr_leader.cpp @@ -31,7 +31,7 @@ * This file implements Primary Backbone Router service management in the Thread Network. */ -#include "leader.hpp" +#include "bbr_leader.hpp" #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) diff --git a/src/core/backbone_router/leader.hpp b/src/core/backbone_router/bbr_leader.hpp similarity index 100% rename from src/core/backbone_router/leader.hpp rename to src/core/backbone_router/bbr_leader.hpp diff --git a/src/core/backbone_router/local.cpp b/src/core/backbone_router/bbr_local.cpp similarity index 99% rename from src/core/backbone_router/local.cpp rename to src/core/backbone_router/bbr_local.cpp index f82cbb665..3414a00a8 100644 --- a/src/core/backbone_router/local.cpp +++ b/src/core/backbone_router/bbr_local.cpp @@ -31,7 +31,7 @@ * This file implements local Backbone Router service. */ -#include "local.hpp" +#include "bbr_local.hpp" #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE diff --git a/src/core/backbone_router/local.hpp b/src/core/backbone_router/bbr_local.hpp similarity index 99% rename from src/core/backbone_router/local.hpp rename to src/core/backbone_router/bbr_local.hpp index b80a8478c..eb3824240 100644 --- a/src/core/backbone_router/local.hpp +++ b/src/core/backbone_router/bbr_local.hpp @@ -40,7 +40,7 @@ #include #include -#include "backbone_router/leader.hpp" +#include "backbone_router/bbr_leader.hpp" #include "common/locator.hpp" #include "net/netif.hpp" #include "thread/network_data.hpp" diff --git a/src/core/common/instance.hpp b/src/core/common/instance.hpp index 63e9474b6..df6f7b522 100644 --- a/src/core/common/instance.hpp +++ b/src/core/common/instance.hpp @@ -79,10 +79,10 @@ #endif #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) -#include "backbone_router/leader.hpp" +#include "backbone_router/bbr_leader.hpp" #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE -#include "backbone_router/local.hpp" +#include "backbone_router/bbr_local.hpp" #endif #endif // (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) diff --git a/src/core/thread/dua_manager.hpp b/src/core/thread/dua_manager.hpp index 69702529e..a0fb863ea 100644 --- a/src/core/thread/dua_manager.hpp +++ b/src/core/thread/dua_manager.hpp @@ -38,7 +38,7 @@ #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) -#include "backbone_router/leader.hpp" +#include "backbone_router/bbr_leader.hpp" #include "common/locator.hpp" #include "net/netif.hpp" diff --git a/src/core/thread/network_data_leader.hpp b/src/core/thread/network_data_leader.hpp index 7c122485d..2120ccbb1 100644 --- a/src/core/thread/network_data_leader.hpp +++ b/src/core/thread/network_data_leader.hpp @@ -39,7 +39,7 @@ #include #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) -#include "backbone_router/leader.hpp" +#include "backbone_router/bbr_leader.hpp" #endif #include "coap/coap.hpp" diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp index afb42551a..55843b17f 100644 --- a/src/core/thread/thread_netif.hpp +++ b/src/core/thread/thread_netif.hpp @@ -48,10 +48,10 @@ #endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) -#include "backbone_router/leader.hpp" +#include "backbone_router/bbr_leader.hpp" #endif #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE -#include "backbone_router/local.hpp" +#include "backbone_router/bbr_local.hpp" #endif #if OPENTHREAD_CONFIG_DUA_ENABLE