From f5dff6c2081be10d320be6e26cad5e25fbfde2ac Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Thu, 15 Sep 2022 13:58:53 +0900 Subject: [PATCH] Add static declaration for thread-test Change-Id: Ia5f8d7954e4e1fa22e0f2e4e907ac99ee47cfb83 Signed-off-by: hyunuk.tak --- include/thread-log.h | 6 +-- src/thread-br.c | 2 +- tests/thread-test/thread-br.c | 78 +++++++++++++++--------------- tests/thread-test/thread-core.c | 16 +++--- tests/thread-test/thread-init.c | 3 -- tests/thread-test/thread-menu.c | 6 +-- tests/thread-test/thread-network.c | 21 ++++---- tests/thread-test/thread-scenarios.c | 19 ++++---- tests/thread-test/thread-srp.c | 10 ++-- tests/unittest/thread-unittest-network.cpp | 4 +- 10 files changed, 81 insertions(+), 84 deletions(-) diff --git a/include/thread-log.h b/include/thread-log.h index bba55b1..ae64b1c 100755 --- a/include/thread-log.h +++ b/include/thread-log.h @@ -41,11 +41,11 @@ extern "C" { #define THREAD_INFO(fmt, args...) \ SLOGI(fmt, ##args) #define THREAD_INFO_C(fmt, arg...) \ - SLOGI_IF(TRUE, LOG_COLOR_GREEN" "fmt" "LOG_COLOR_RESET, ##arg) + SLOGI_IF(TRUE, LOG_COLOR_GREEN " " fmt " " LOG_COLOR_RESET, ##arg) #define THREAD_WARN(fmt, arg...) \ - SLOGI_IF(TRUE, LOG_COLOR_YELLOW" "fmt" "LOG_COLOR_RESET, ##arg) + SLOGI_IF(TRUE, LOG_COLOR_YELLOW " " fmt " " LOG_COLOR_RESET, ##arg) #define THREAD_ERR(fmt, arg...) \ - SLOGI_IF(TRUE, LOG_COLOR_RED" "fmt" "LOG_COLOR_RESET, ##arg) + SLOGI_IF(TRUE, LOG_COLOR_RED " " fmt " " LOG_COLOR_RESET, ##arg) #define THREAD_DEPRECATED_LOG(origin, substitution) \ SLOGI("DEPRECATION WARNING: %s() is deprecated and will be removed " \ diff --git a/src/thread-br.c b/src/thread-br.c index 3fdbb3f..bb462cf 100644 --- a/src/thread-br.c +++ b/src/thread-br.c @@ -550,7 +550,7 @@ int thread_onmesh_prefix_create(thread_instance_h instance, thread_instance_s *current_instance = instance; thread_onmesh_prefix_info_s *new_onmesh_prefix = _create_new_onmesh_prefix(); - retv_if (!new_onmesh_prefix, THREAD_ERROR_OUT_OF_MEMORY); + retv_if(!new_onmesh_prefix, THREAD_ERROR_OUT_OF_MEMORY); current_instance->onmesh_prefix_list = g_slist_append( current_instance->onmesh_prefix_list, diff --git a/tests/thread-test/thread-br.c b/tests/thread-test/thread-br.c index 2518753..cc6cebb 100644 --- a/tests/thread-test/thread-br.c +++ b/tests/thread-test/thread-br.c @@ -34,47 +34,47 @@ #include "thread-util.h" /* External route related variables */ -char g_str_ext_ipv6_prefix[MENU_DATA_SIZE + 1]; -char g_str_ext_ipv6_prefix_len[MENU_DATA_SIZE + 1]; -char g_str_ext_rloc16[MENU_DATA_SIZE + 1]; -char g_str_ext_preference[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_ext_is_stable[MENU_DATA_SIZE + 1] = {"1"}; - -uint8_t g_ext_ipv6_prefix[THREAD_IPV6_ADDRESS_SIZE]; -uint8_t g_ext_ipv6_prefix_len; -uint16_t g_ext_rloc16; -int8_t g_ext_preference; -bool g_ext_is_stable; -bool g_ext_is_device_next_hop = THREAD_IS_DEVICE_NEXT_HOP_DEFAULT; +static char g_str_ext_ipv6_prefix[MENU_DATA_SIZE + 1]; +static char g_str_ext_ipv6_prefix_len[MENU_DATA_SIZE + 1]; +static char g_str_ext_rloc16[MENU_DATA_SIZE + 1]; +static char g_str_ext_preference[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_ext_is_stable[MENU_DATA_SIZE + 1] = {"1"}; + +static uint8_t g_ext_ipv6_prefix[THREAD_IPV6_ADDRESS_SIZE]; +static uint8_t g_ext_ipv6_prefix_len; +static uint16_t g_ext_rloc16; +static int8_t g_ext_preference; +static bool g_ext_is_stable; +static bool g_ext_is_device_next_hop = THREAD_IS_DEVICE_NEXT_HOP_DEFAULT; /* Onmesh prefix related variables */ -char g_str_onmesh_ipv6_prefix[MENU_DATA_SIZE + 1]; -char g_str_onmesh_ipv6_prefix_len[MENU_DATA_SIZE + 1]; -char g_str_onmesh_preference[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_slaac[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_dhcp[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_configure[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_default_route[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_on_mesh[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_stable[MENU_DATA_SIZE + 1] = {"1"}; -char g_str_preferred[MENU_DATA_SIZE + 1] = {"1"}; - -uint8_t g_onmesh_ipv6_prefix[THREAD_IPV6_ADDRESS_SIZE]; -uint8_t g_onmesh_ipv6_prefix_len; -uint16_t g_onmesh_rloc; -uint8_t g_onmesh_preference; -bool g_onmesh_is_preferred; -bool g_onmesh_is_slaac; -bool g_onmesh_is_dhcp; -bool g_onmesh_is_configure; -bool g_onmesh_is_default_route; -bool g_onmesh_is_on_mesh; -bool g_onmesh_is_stable; -bool g_onmesh_is_nd_dns; -bool g_onmesh_is_dp; - -GSList *route_list; -GSList *onmesh_prefix_list; +static char g_str_onmesh_ipv6_prefix[MENU_DATA_SIZE + 1]; +static char g_str_onmesh_ipv6_prefix_len[MENU_DATA_SIZE + 1]; +static char g_str_onmesh_preference[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_slaac[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_dhcp[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_configure[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_default_route[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_on_mesh[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_stable[MENU_DATA_SIZE + 1] = {"1"}; +static char g_str_preferred[MENU_DATA_SIZE + 1] = {"1"}; + +static uint8_t g_onmesh_ipv6_prefix[THREAD_IPV6_ADDRESS_SIZE]; +static uint8_t g_onmesh_ipv6_prefix_len; +static uint16_t g_onmesh_rloc; +static uint8_t g_onmesh_preference; +static bool g_onmesh_is_preferred; +static bool g_onmesh_is_slaac; +static bool g_onmesh_is_dhcp; +static bool g_onmesh_is_configure; +static bool g_onmesh_is_default_route; +static bool g_onmesh_is_on_mesh; +static bool g_onmesh_is_stable; +static bool g_onmesh_is_nd_dns; +static bool g_onmesh_is_dp; + +static GSList *route_list; +static GSList *onmesh_prefix_list; void free_list(GSList *list) { diff --git a/tests/thread-test/thread-core.c b/tests/thread-test/thread-core.c index 7d2d987..0cc7bd6 100755 --- a/tests/thread-test/thread-core.c +++ b/tests/thread-test/thread-core.c @@ -32,16 +32,16 @@ #include "thread-log.h" #include "thread-util.h" -thread_device_role_e g_device_role; -thread_device_type_e g_device_type; -char g_str_device_type[MENU_DATA_SIZE + 1]; +static thread_device_role_e g_device_role; +static thread_device_type_e g_device_type; +static char g_str_device_type[MENU_DATA_SIZE + 1]; -char g_str_scan_duration[MENU_DATA_SIZE + 1]; -uint16_t g_scan_duration; +static char g_str_scan_duration[MENU_DATA_SIZE + 1]; +static uint16_t g_scan_duration; -uint64_t g_extended_address; -thread_scan_param_h g_param_handle; -const char* g_uuid; +static uint64_t g_extended_address; +static thread_scan_param_h g_param_handle; +static const char* g_uuid; static void __thread_scan_callback(int result, thread_network_scanning_state_e state, uint64_t ext_address, const char *network_name, uint64_t ext_panidi, diff --git a/tests/thread-test/thread-init.c b/tests/thread-test/thread-init.c index a8b2733..16eaeb4 100755 --- a/tests/thread-test/thread-init.c +++ b/tests/thread-test/thread-init.c @@ -25,9 +25,6 @@ #include "thread.h" #include "thread-menu.h" -char g_selected_user_idx[MENU_DATA_SIZE + 1] = {0,}; - - static int run_thread_init(MManager *mm, struct menu_data *menu) { msg("thread_initialize started..."); diff --git a/tests/thread-test/thread-menu.c b/tests/thread-test/thread-menu.c index 7675fba..1cf4959 100755 --- a/tests/thread-test/thread-menu.c +++ b/tests/thread-test/thread-menu.c @@ -33,10 +33,10 @@ #define TAB_SPACE " " -char key_buffer[MENU_DATA_SIZE]; -int flag_pid_display = 1; +static char key_buffer[MENU_DATA_SIZE]; +static int flag_pid_display = 1; -char g_thread_interface_str[MENU_DATA_SIZE + 1] = "thread.default.interface"; +static char g_thread_interface_str[MENU_DATA_SIZE + 1] = "thread.default.interface"; pid_t get_tid() { diff --git a/tests/thread-test/thread-network.c b/tests/thread-test/thread-network.c index 7b9a993..a0f1228 100644 --- a/tests/thread-test/thread-network.c +++ b/tests/thread-test/thread-network.c @@ -42,14 +42,10 @@ static char g_str_buf_length[NETWORK_DATA_SIZE + 1]; static char g_str_tlvs_buffer[2*NETWORK_DATA_SIZE + 1]; static thread_network_h g_network; -uint32_t g_channel; -uint64_t g_extended_panid; -uint16_t g_panid; - static char g_str_ipaddr_type[NETWORK_DATA_SIZE + 1] = "0"; static char g_str_ipaddr[NETWORK_DATA_SIZE + 1]; -uint8_t g_ipv6_address[THREAD_IPV6_ADDRESS_SIZE]; +static uint8_t g_ipv6_address[THREAD_IPV6_ADDRESS_SIZE]; static int run_thread_network_destroy_operational_network(MManager *mm, struct menu_data *menu) { @@ -77,13 +73,16 @@ OUT: static int run_thread_network_create_operational_network(MManager *mm, struct menu_data *menu) { FUNC_ENTRY; + uint32_t channel = 0; + uint64_t extended_panid = 0; + uint16_t panid = 0; thread_instance_h g_instance = mm->t_instance; if (g_instance == NULL) goto OUT; - sscanf(g_str_channel, "%x", &g_channel); - sscanf(g_str_extended_panid, "%zu", (size_t *)&g_extended_panid); - sscanf(g_str_panid, "%hu", &g_panid); + sscanf(g_str_channel, "%x", &channel); + sscanf(g_str_extended_panid, "%zu", (size_t *)&extended_panid); + sscanf(g_str_panid, "%hu", &panid); int ret = thread_network_create(&g_network); if (ret == THREAD_ERROR_NONE) @@ -109,19 +108,19 @@ static int run_thread_network_create_operational_network(MManager *mm, struct me else msg("thread_network_set_pskc failed"); - ret = thread_network_set_channel(g_network, g_channel); + ret = thread_network_set_channel(g_network, channel); if (ret == THREAD_ERROR_NONE) msg("thread_network_set_channel success"); else msg("thread_network_set_channel failed"); - ret = thread_network_set_extended_panid(g_network, g_extended_panid); + ret = thread_network_set_extended_panid(g_network, extended_panid); if (ret == THREAD_ERROR_NONE) msg("thread_network_set_extended_panid success"); else msg("thread_network_set_extended_panid failed"); - ret = thread_network_set_panid(g_network, g_panid); + ret = thread_network_set_panid(g_network, panid); if (ret == THREAD_ERROR_NONE) msg("thread_network_set_panid success"); else diff --git a/tests/thread-test/thread-scenarios.c b/tests/thread-test/thread-scenarios.c index 26d15f1..7aae596 100644 --- a/tests/thread-test/thread-scenarios.c +++ b/tests/thread-test/thread-scenarios.c @@ -43,10 +43,6 @@ static thread_network_h g_network; static char g_joiner_uuid[MENU_DATA_SIZE + 1]; static char g_joiner_passphrase[MENU_DATA_SIZE + 1]; -uint32_t g_channel; -uint64_t g_extended_panid; -uint16_t g_panid; - static char g_prov_url[MENU_DATA_SIZE + 1]; static char g_vendor_name[MENU_DATA_SIZE + 1]; static char g_vendor_model[MENU_DATA_SIZE + 1]; @@ -146,13 +142,16 @@ OUT: static int run_thread_start_leader_as_commissioner(MManager *mm, struct menu_data *menu) { FUNC_ENTRY; + uint32_t channel = 0; + uint64_t extended_panid = 0; + uint16_t panid = 0; thread_instance_h g_instance = mm->t_instance; if (g_instance == NULL) goto OUT; - sscanf(g_str_channel, "%x", &g_channel); - sscanf(g_str_extended_panid, "%zu", (size_t *)&g_extended_panid); - sscanf(g_str_panid, "%hu", &g_panid); + sscanf(g_str_channel, "%x", &channel); + sscanf(g_str_extended_panid, "%zu", (size_t *)&extended_panid); + sscanf(g_str_panid, "%hu", &panid); int ret = THREAD_ERROR_NONE; @@ -188,19 +187,19 @@ static int run_thread_start_leader_as_commissioner(MManager *mm, struct menu_dat goto OUT; } - ret = thread_network_set_channel(g_network, g_channel); + ret = thread_network_set_channel(g_network, channel); if (ret != THREAD_ERROR_NONE) { msg("Failed: %s", _thread_get_error_message(ret)); goto OUT; } - ret = thread_network_set_extended_panid(g_network, g_extended_panid); + ret = thread_network_set_extended_panid(g_network, extended_panid); if (ret != THREAD_ERROR_NONE) { msg("Failed: %s", _thread_get_error_message(ret)); goto OUT; } - ret = thread_network_set_panid(g_network, g_panid); + ret = thread_network_set_panid(g_network, panid); if (ret != THREAD_ERROR_NONE) { msg("Failed: %s", _thread_get_error_message(ret)); goto OUT; diff --git a/tests/thread-test/thread-srp.c b/tests/thread-test/thread-srp.c index f3d5150..0878a97 100644 --- a/tests/thread-test/thread-srp.c +++ b/tests/thread-test/thread-srp.c @@ -32,11 +32,11 @@ #include "thread-log.h" #include "thread-util.h" -const char *service_name; -const char *address; -uint16_t port; -bool is_deleted; -uint64_t g_port; +static const char *service_name; +static const char *address; +static uint16_t port; +static bool is_deleted; +static uint64_t g_port; static char g_host_address[MENU_DATA_SIZE + 1]; static char g_service_name[MENU_DATA_SIZE + 1]; diff --git a/tests/unittest/thread-unittest-network.cpp b/tests/unittest/thread-unittest-network.cpp index dbe3e14..8509c3f 100644 --- a/tests/unittest/thread-unittest-network.cpp +++ b/tests/unittest/thread-unittest-network.cpp @@ -135,6 +135,7 @@ TEST_F(ThreadNetworkTest, GetActiveDatasetTlvsNotInitialized) EXPECT_EQ(THREAD_ERROR_NONE, thread_deinitialize()); EXPECT_EQ(THREAD_ERROR_NOT_INITIALIZED, thread_network_get_active_dataset_tlvs(instance, &tlvs_buffer, &tlvsBufferLength)); + g_free(tlvs_buffer); } TEST_F(ThreadNetworkTest, GetActiveDatasetTlvsInvalidParameter) @@ -142,6 +143,7 @@ TEST_F(ThreadNetworkTest, GetActiveDatasetTlvsInvalidParameter) uint8_t *tlvs_buffer = NULL; EXPECT_EQ(THREAD_ERROR_INVALID_PARAMETER, thread_network_get_active_dataset_tlvs(instance, &tlvs_buffer, &tlvsBufferLength)); + g_free(tlvs_buffer); } TEST_F(ThreadNetworkTest, GetActiveDatasetTlvsErrorNone) @@ -482,4 +484,4 @@ TEST_F(ThreadNetworkTest, UnsetOperationalNetworkErrorNone) thread_set_operational_network(instance, network)); EXPECT_EQ(THREAD_ERROR_NONE, thread_unset_operational_network(instance)); -} \ No newline at end of file +} -- 2.7.4