From bbb01c6d40f9415c7a93ab2d7646714631d9c5a1 Mon Sep 17 00:00:00 2001 From: Nishant Chaprana Date: Tue, 14 Dec 2021 10:18:03 +0530 Subject: [PATCH] Fix set bssid operation Change-Id: Ic8a4b7485ec2770e5dc4636bdfaa0069b16a734c Signed-off-by: Nishant Chaprana --- src/network_dbus.c | 6 ++---- tests/gtest-wifi-manager-scan.cpp | 3 +-- tests/mocks/mock_gdbus.c | 1 + tools/manager-test/wman_test_extension.c | 8 +++++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/network_dbus.c b/src/network_dbus.c index c5545dd..a1e99a6 100644 --- a/src/network_dbus.c +++ b/src/network_dbus.c @@ -2388,14 +2388,12 @@ int _net_dbus_set_bssid(network_info_s *network_info, char *bssid) net_err_e Error = NET_ERR_NONE; GVariant *message = NULL; - const char *prop_key = "SetBSSID"; - const char *method = "SetProperty"; + const char *method = "SetBSSID"; GVariant *params = NULL; WIFI_LOG(WIFI_INFO, "SetBSSID [%s]", bssid); - params = g_variant_new("(ssv)", network_info->interface_name, - prop_key, g_variant_new_string(bssid)); + params = g_variant_new("(ss)", network_info->interface_name, bssid); message = _net_invoke_dbus_method(network_info, CONNMAN_SERVICE, CONNMAN_WIFI_TECHNOLOGY_PREFIX, diff --git a/tests/gtest-wifi-manager-scan.cpp b/tests/gtest-wifi-manager-scan.cpp index ae958d1..84087ce 100755 --- a/tests/gtest-wifi-manager-scan.cpp +++ b/tests/gtest-wifi-manager-scan.cpp @@ -655,8 +655,7 @@ TEST_F(UtcWifiManagerScan, SetBssidN2) TEST_F(UtcWifiManagerScan, SetBssidP1) { - char bssid = 'a'; - EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, wifi_manager_set_bssid(handle, &bssid)); + EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, wifi_manager_set_bssid(handle, (char *)"11:22:33:44:55:66")); } diff --git a/tests/mocks/mock_gdbus.c b/tests/mocks/mock_gdbus.c index 65d0547..ae02f11 100644 --- a/tests/mocks/mock_gdbus.c +++ b/tests/mocks/mock_gdbus.c @@ -314,6 +314,7 @@ method_call_reply_s g_dbus_reply[] = { {"TdlsCancelChannelSwitch", __get_mock_variant_int}, {"LoadConfiguration", __get_mock_variant_get_scanstate}, {"GetConfigIds", __get_mock_variant_get_interfaces}, + {"SetBSSID", __get_mock_variant_int}, {NULL, NULL} }; diff --git a/tools/manager-test/wman_test_extension.c b/tools/manager-test/wman_test_extension.c index 15f4563..e7fba0f 100644 --- a/tools/manager-test/wman_test_extension.c +++ b/tools/manager-test/wman_test_extension.c @@ -574,10 +574,12 @@ static const char *__test_convert_connection_mode_to_string(wifi_manager_connect return "802.11a"; case WIFI_MANAGER_CONNECTION_MODE_80211_AC: return "802.11ac"; + case WIFI_MANAGER_CONNECTION_MODE_80211_AX: + return "802.11ax"; case WIFI_MANAGER_CONNECTION_MODE_UNKNOWN: - return "Uknown"; + return "Unknown"; default: - return "Uknown"; + return "Unknown"; } } @@ -815,7 +817,7 @@ void wman_test_print_connection_mode(wifi_manager_ap_h ap) wifi_manager_connection_mode_e mode; if (wifi_manager_ap_get_connection_mode(ap, &mode) == WIFI_MANAGER_ERROR_NONE) - printf("Wi-Fi operation mode: %d\n", mode); + printf("Wi-Fi operation mode: %s(%d)\n", __test_convert_connection_mode_to_string(mode), mode); else printf("Fail to get operation mode\n"); } -- 2.7.4