openharmony/communication_wifi
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_wifi.git synced 2024-11-23 23:19:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

热点名称或安全级别变更重新生成随机MAC

Browse Source 
Signed-off-by: kingarden_99@163.com <kingarden_99@163.com>
This commit is contained in:
kingarden_99@163.com 2023-12-20 10:36:58 +08:00
parent f4cc4e35d0
commit 1aae5e4cdf
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.cpp
View File

@ -145,6 +145,30 @@ bool ApStartedState::ExecuteStateMsg(InternalMessage *msg)
return EXECUTED;
}
bool ApStartedState::UpdatMacAddress(const std::string ssid, KeyMgmt securityType)
{
HotspotConfig curApConfig;
WifiSettings::GetInstance().GetHotspotConfig(curApConfig, m_id);
LOGD("%{public}s: [ssid:%{private}s, securityType:%{public}d] ==> [ssid:%{private}s, securityType:%{public}d]",
__func__, curApConfig.GetSsid().c_str(), curApConfig.GetSecurityType(),
ssid.c_str(), securityType);
if ((curApConfig.GetSsid() != ssid) ||
(curApConfig.GetSecurityType() != securityType)) {
std::string macAddress;
WifiSettings::GetInstance().GenerateRandomMacAddress(macAddress);
if (MacAddress::IsValidMac(macAddress.c_str())) {
if (WifiApHalInterface::GetInstance().SetConnectMacAddr(macAddress) != WIFI_IDL_OPT_OK) {
LOGE("%{public}s: failed to set ap MAC address:%{private}s", __func__, macAddress.c_str());
return false;
}
} else {
LOGW("%{public}s: macAddress is invalid", __func__);
}
}
return true;
}
bool ApStartedState::SetConfig(HotspotConfig &apConfig)
{
WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__);
@ -296,9 +320,14 @@ void ApStartedState::ProcessCmdStationLeave(InternalMessage &msg)
void ApStartedState::ProcessCmdSetHotspotConfig(InternalMessage &msg)
{
WIFI_LOGI("Instance %{public}d %{public}s", m_id, __func__);
m_hotspotConfig.SetSsid(msg.GetStringFromMessage());
std::string ssid = msg.GetStringFromMessage();
KeyMgmt securityType = static_cast<KeyMgmt>(msg.GetIntFromMessage());
#ifdef SUPPORT_LOCAL_RANDOM_MAC
UpdatMacAddress(ssid, securityType);
#endif
m_hotspotConfig.SetSsid(ssid);
m_hotspotConfig.SetPreSharedKey(msg.GetStringFromMessage());
m_hotspotConfig.SetSecurityType(static_cast<KeyMgmt>(msg.GetIntFromMessage()));
m_hotspotConfig.SetSecurityType(securityType);
m_hotspotConfig.SetBand(static_cast<BandType>(msg.GetIntFromMessage()));
m_hotspotConfig.SetChannel(msg.GetIntFromMessage());
m_hotspotConfig.SetMaxConn(msg.GetIntFromMessage());

8
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_ap/ap_started_state.h
View File

@ -238,6 +238,14 @@ private:
*/
void Init();
/**
* @Description update MAC address.
* @param ssid - Network name
* @param securityType - Security type
* @return true: Set successfully false: Set failed
*/
bool UpdatMacAddress(const std::string ssid, KeyMgmt securityType);
private:
HotspotConfig m_hotspotConfig; /*
* Store the configuration when set to