From f6fd04485ebda2e7b6e63f5692b2d97bb055833d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 18:39:49 +0800 Subject: [PATCH 1/6] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_manage/wifi_device_service_impl.cpp | 11 ++++++++-- .../wifi_manage/wifi_sta/sta_service.cpp | 20 ++++++++++--------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 3b9f38f34..2cba3099b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -374,14 +374,16 @@ bool WifiDeviceServiceImpl::CheckConfigEap(const WifiDeviceConfig &config) bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) { if ((config.ssid.length() <= 0) || (config.keyMgmt.length()) <= 0) { + WIFI_LOGE("CheckConfigPwd: invalid ssid or keyMgmt!"); return false; } + WIFI_LOGE("CheckConfigPwd: keyMgmt = %{public}s!", config.keyMgmt.c_str()); if (config.keyMgmt == KEY_MGMT_EAP) { return CheckConfigEap(config); } - if ((config.keyMgmt != KEY_MGMT_NONE && config.keyMgmt != KEY_MGMT_NONE) && + if ((config.keyMgmt != KEY_MGMT_NONE && config.keyMgmt != KEY_MGMT_WEP) && config.preSharedKey.empty()) { WIFI_LOGE("CheckConfigPwd: preSharedKey is empty!"); return false; @@ -389,7 +391,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) int len = config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); - WIFI_LOGI("CheckConfigPwd, keyMgmt: %{public}s, len: %{public}d", config.keyMgmt.c_str(), len); + WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid), len); if (config.keyMgmt == KEY_MGMT_WEP) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep @@ -736,15 +738,18 @@ ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId, bool isCandidate) } if (!IsStaServiceRunning()) { + WIFI_LOGE("ConnectToNetwork: sta service is not running!"); return WIFI_OPT_STA_NOT_OPENED; } if (networkId < 0) { + WIFI_LOGE("ConnectToNetwork: invalid networkId = %{public}d!"); return WIFI_OPT_INVALID_PARAM; } IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGE("ConnectToNetwork: pService is nullptr!"); return WIFI_OPT_STA_NOT_OPENED; } @@ -781,10 +786,12 @@ ErrCode WifiDeviceServiceImpl::ConnectToDevice(const WifiDeviceConfig &config) return WIFI_OPT_INVALID_PARAM; } if (!IsStaServiceRunning()) { + WIFI_LOGE("ConnectToDevice: sta service is not running!"); return WIFI_OPT_STA_NOT_OPENED; } IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGE("ConnectToNetwork: pService is nullptr!"); return WIFI_OPT_STA_NOT_OPENED; } return pService->ConnectToDevice(config); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 40ce71346..6cd8759e9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -186,8 +186,9 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const std::string bssid; WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { - LOGI("A network with the same name already exists in the configuration center!\n"); netWorkId = tempDeviceConfig.networkId; + LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s." + netWorkId, SsidAnonymize(config.ssid)); CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); @@ -226,7 +227,7 @@ int StaService::UpdateDeviceConfig(const WifiDeviceConfig &config) const ErrCode StaService::RemoveDevice(int networkId) const { - LOGD("Enter StaService::RemoveDevice.\n"); + LOGI("Enter StaService::RemoveDevice, networkId = %{public}d.\n", networkId); /* Remove network configuration. */ if (WifiStaHalInterface::GetInstance().RemoveDevice(networkId) != WIFI_IDL_OPT_OK) { LOGE("RemoveDeviceConfig() failed!"); @@ -251,7 +252,7 @@ ErrCode StaService::RemoveDevice(int networkId) const ErrCode StaService::RemoveAllDevice() const { - LOGD("Enter StaService::RemoveAllDevice.\n"); + LOGI("Enter StaService::RemoveAllDevice.\n"); if (WifiStaHalInterface::GetInstance().ClearDeviceConfig() == WIFI_IDL_OPT_OK) { LOGD("Remove all device config successfully!"); if (WifiStaHalInterface::GetInstance().SaveDeviceConfig() != WIFI_IDL_OPT_OK) { @@ -273,21 +274,21 @@ ErrCode StaService::RemoveAllDevice() const ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const { - LOGI("Enter StaService::ConnectToDevice.\n"); + LOGI("Enter StaService::ConnectToDevice, ssid = %{public}s.\n", SsidAnonymize(config.ssid)); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = AddDeviceConfig(config); if(netWorkId == INVALID_NETWORK_ID) { - LOGD("StaService::ConnectTo AddDeviceConfig failed!"); + LOGD("StaService::ConnectToDevice, AddDeviceConfig failed!"); return WIFI_OPT_FAILED; } - LOGD("StaService::ConnectTo: %{public}d", netWorkId); + LOGI("StaService::ConnectToDevice, netWorkId: %{public}d", netWorkId); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_NETWORK, netWorkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; } ErrCode StaService::ConnectToNetwork(int networkId) const { - LOGI("Enter StaService::ConnectToNetwork, networkId is %{public}d.\n", networkId); + LOGI("Enter StaService::ConnectToNetwork, networkId is %{public}d.", networkId); WifiDeviceConfig config; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, config) != 0) { LOGE("WifiDeviceConfig is null!"); @@ -295,6 +296,7 @@ ErrCode StaService::ConnectToNetwork(int networkId) const } CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); + LOGI("StaService::ConnectToNetwork, ssid = %{public}s.", SsidAnonymize(config.ssid)); pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, networkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; @@ -310,7 +312,7 @@ ErrCode StaService::ReAssociate() const ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const { - WIFI_LOGI("Enter StaService::EnableDeviceConfig! networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::EnableDeviceConfig, networkid is %{public}d", networkId); /* Update wifi status. */ if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::ENABLED, attemptEnable) < @@ -324,7 +326,7 @@ ErrCode StaService::EnableDeviceConfig(int networkId, bool attemptEnable) const ErrCode StaService::DisableDeviceConfig(int networkId) const { - WIFI_LOGI("Enter StaService::DisableDeviceConfig.networkid is %{public}d", networkId); + WIFI_LOGI("Enter StaService::DisableDeviceConfig, networkid is %{public}d", networkId); if (WifiSettings::GetInstance().SetDeviceState(networkId, (int)WifiDeviceConfigStatus::DISABLED) < 0) { WIFI_LOGE("Disable device config failed!"); -- Gitee From 9b074ec2472989564e82abb5bc9503adc4bdf8cd Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 18:47:23 +0800 Subject: [PATCH 2/6] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 2cba3099b..7c01c5fb9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -378,7 +378,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) return false; } - WIFI_LOGE("CheckConfigPwd: keyMgmt = %{public}s!", config.keyMgmt.c_str()); + WIFI_LOGI("CheckConfigPwd: keyMgmt = %{public}s!", config.keyMgmt.c_str()); if (config.keyMgmt == KEY_MGMT_EAP) { return CheckConfigEap(config); } -- Gitee From d559f3ac280bff44045a8e13aae31899aee25e00 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:14:58 +0800 Subject: [PATCH 3/6] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7c01c5fb9..a88ef62c1 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -391,7 +391,7 @@ bool WifiDeviceServiceImpl::CheckConfigPwd(const WifiDeviceConfig &config) int len = config.preSharedKey.length(); bool isAllHex = std::all_of(config.preSharedKey.begin(), config.preSharedKey.end(), isxdigit); - WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid), len); + WIFI_LOGI("CheckConfigPwd, ssid: %{public}s, psk len: %{public}d", SsidAnonymize(config.ssid).c_str(), len); if (config.keyMgmt == KEY_MGMT_WEP) { for (int i = 0; i != WEPKEYS_SIZE; ++i) { if (!config.wepKeys[i].empty()) { // wep diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 6cd8759e9..ba54ed849 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -188,7 +188,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { netWorkId = tempDeviceConfig.networkId; LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s." - netWorkId, SsidAnonymize(config.ssid)); + netWorkId, SsidAnonymize(config.ssid).c_str()); CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0); @@ -274,7 +274,7 @@ ErrCode StaService::RemoveAllDevice() const ErrCode StaService::ConnectToDevice(const WifiDeviceConfig &config) const { - LOGI("Enter StaService::ConnectToDevice, ssid = %{public}s.\n", SsidAnonymize(config.ssid)); + LOGI("Enter StaService::ConnectToDevice, ssid = %{public}s.\n", SsidAnonymize(config.ssid).c_str()); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); int netWorkId = AddDeviceConfig(config); if(netWorkId == INVALID_NETWORK_ID) { @@ -296,7 +296,7 @@ ErrCode StaService::ConnectToNetwork(int networkId) const } CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED); - LOGI("StaService::ConnectToNetwork, ssid = %{public}s.", SsidAnonymize(config.ssid)); + LOGI("StaService::ConnectToNetwork, ssid = %{public}s.", SsidAnonymize(config.ssid).c_str()); pStaAutoConnectService->EnableOrDisableBssid(config.bssid, true, 0); pStaStateMachine->SendMessage(WIFI_SVR_CMD_STA_CONNECT_SAVED_NETWORK, networkId, NETWORK_SELECTED_BY_THE_USER); return WIFI_OPT_SUCCESS; -- Gitee From 5b94a5466f5f258fe66a9991f3c67a0c189bd4a7 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:36:36 +0800 Subject: [PATCH 4/6] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index ba54ed849..7028cf9c5 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -23,6 +23,7 @@ #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" #include "wifi_supplicant_hal_interface.h" +#inlcude "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaService"); namespace OHOS { @@ -187,7 +188,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const WifiDeviceConfig tempDeviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(config.ssid, config.keyMgmt, tempDeviceConfig) == 0) { netWorkId = tempDeviceConfig.networkId; - LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s." + LOGI("The same network name already exists in settings! netWorkId:%{public}d, ssid:%{public}s.", netWorkId, SsidAnonymize(config.ssid).c_str()); CHECK_NULL_AND_RETURN(pStaAutoConnectService, WIFI_OPT_FAILED); bssid = config.bssid.empty() ? tempDeviceConfig.bssid : config.bssid; -- Gitee From 413f703d6cbd034aa244dbebfcafe8679795d95d Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:43:33 +0800 Subject: [PATCH 5/6] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index a88ef62c1..0baf7b69d 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -743,7 +743,7 @@ ErrCode WifiDeviceServiceImpl::ConnectToNetwork(int networkId, bool isCandidate) } if (networkId < 0) { - WIFI_LOGE("ConnectToNetwork: invalid networkId = %{public}d!"); + WIFI_LOGE("ConnectToNetwork: invalid networkId = %{public}d!", networkId); return WIFI_OPT_INVALID_PARAM; } -- Gitee From 710cb60a7a172adff4089ee63690529f65453af1 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 29 Aug 2022 19:53:36 +0800 Subject: [PATCH 6/6] bugfix for wep 0829 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_sta/sta_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp index 7028cf9c5..51ae16420 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_service.cpp @@ -23,7 +23,7 @@ #include "wifi_settings.h" #include "wifi_sta_hal_interface.h" #include "wifi_supplicant_hal_interface.h" -#inlcude "wifi_common_util.h" +#include "wifi_common_util.h" DEFINE_WIFILOG_LABEL("StaService"); namespace OHOS { -- Gitee