Signed-off-by: wujun <wujun156@huawei.com>
This commit is contained in:
wujun 2024-11-04 15:05:44 +08:00
parent 004bf0a59b
commit ab1140860c
2 changed files with 6 additions and 4 deletions

View File

@ -405,8 +405,8 @@ void StaService::UpdateEapConfig(const WifiDeviceConfig &config, WifiEapConfig &
int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const
{
LOGI("Enter AddDeviceConfig, ssid:%{public}s, bssid=%{public}s\n",
SsidAnonymize(config.ssid).c_str(), MacAnonymize(config.bssid).c_str());
LOGI("Enter AddDeviceConfig, ssid:%{public}s, bssid=%{public}s, keyMgmt: %{public}s\n",
SsidAnonymize(config.ssid).c_str(), MacAnonymize(config.bssid).c_str(), config.keyMgmt.c_str());
CHECK_NULL_AND_RETURN(pStaStateMachine, WIFI_OPT_FAILED);
int netWorkId = INVALID_NETWORK_ID;
bool isUpdate = false;
@ -424,6 +424,7 @@ int StaService::AddDeviceConfig(const WifiDeviceConfig &config) const
pStaAutoConnectService->EnableOrDisableBssid(bssid, true, 0);
}
isUpdate = true;
LOGI("AddDeviceConfig update device networkId:%{public}d", netWorkId);
} else {
netWorkId = WifiSettings::GetInstance().GetNextNetworkId();
LOGI("AddDeviceConfig alloc new id[%{public}d] succeed!", netWorkId);

View File

@ -152,9 +152,9 @@ void WifiSettings::SyncAfterDecryped(WifiDeviceConfig &config)
void WifiSettings::LogDeviceConfigsChanged()
{
for (const auto &config : mWifiDeviceConfig) {
LOGI("%{public}s: instanceId: %{public}d, networkId: %{public}d, ssid: %{public}s, preSharedKeyLen:%{public}d,"
LOGI("%{public}s networkId: %{public}d, ssid: %{public}s, preSharedKeyLen:%{public}d,"
"keyMgmt: %{public}s, hiddenSSID:%{public}d, uid:%{public}d, version:%{public}d", __FUNCTION__,
config.instanceId, config.networkId, SsidAnonymize(config.ssid).c_str(), config.preSharedKey.length(),
config.networkId, SsidAnonymize(config.ssid).c_str(), config.preSharedKey.length(),
config.keyMgmt.c_str(), config.hiddenSSID, config.uid, config.version);
}
}
@ -518,6 +518,7 @@ int WifiSettings::SyncDeviceConfig()
int WifiSettings::ReloadDeviceConfig()
{
LOGI("ReloadDeviceConfig enter");
#ifndef CONFIG_NO_CONFIG_WRITE
std::unique_lock<std::mutex> lock(mStaMutex);
int ret = mSavedDeviceConfig.LoadConfig();