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

!3253 wifi6自愈之后应该重新dns自愈

Browse Source 
Merge pull request !3253 from yiyajun/master
This commit is contained in:
openharmony_ci 2024-11-02 10:41:47 +00:00 committed by Gitee
commit cdd3f14c53
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_self_cure/self_cure_common.h
View File

@ -131,7 +131,7 @@ namespace Wifi {
#define SET_STATIC_IP_TIMEOUT_MS (3 * 1000)
#define INTERNET_DETECT_INTERVAL_MS (6 * 1000)
#define WIFI_BLA_LIST_TIME_EXPIRED (2 * 24 * 60 * 60 * 1000)
#define HTTP_DETECT_TIMEOUT (5 * 1000)
#define HTTP_DETECT_TIMEOUT (13 * 1000)
#define HTTP_DETECT_USLEEP_TIME (50 * 1000)
#define SELF_CURE_CONN_FAILED_TIMEOUT_MS (8 * 1000)
#define WIFI_CONNECT_FAIL_LIST_TIME_EXPIRED (30 * 1000)

29
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_self_cure/self_cure_state_machine.cpp
View File

@ -546,6 +546,10 @@ void SelfCureStateMachine::ConnectedMonitorState::HandleInternetFailedDetected(I
WIFI_LOGI("%{public}s: TransToWifi6SelfCure", __FUNCTION__);
return;
}
if ((msg != nullptr) && (!pSelfCureStateMachine->internetUnknown)) {
pSelfCureStateMachine->internetUnknown = msg->GetParam1() == 1;
}
if (pSelfCureStateMachine->IsNeedWifiReassocUseDeviceMac()) {
RequestReassocWithFactoryMac();
return;
@ -1310,9 +1314,12 @@ void SelfCureStateMachine::InternetSelfCureState::GetReplacedDnsServers(
void SelfCureStateMachine::InternetSelfCureState::UpdateDnsServers(std::vector<std::string>& dnsServers)
{
WifiLinkedInfo linkedInfo;
WifiConfigCenter::GetInstance().GetLinkedInfo(linkedInfo, pSelfCureStateMachine->m_instId);
WifiDeviceConfig config;
WifiSettings::GetInstance().GetDeviceConfig(linkedInfo.networkId, config);
IpInfo ipInfo;
IpV6Info ipV6Info;
WifiDeviceConfig config;
WifiConfigCenter::GetInstance().GetIpInfo(ipInfo, 0);
WifiConfigCenter::GetInstance().GetIpv6Info(ipV6Info, 0);
ipInfo.primaryDns = IpTools::ConvertIpv4Address(dnsServers[0]);
@ -1936,10 +1943,14 @@ bool SelfCureStateMachine::Wifi6SelfCureState::ExecuteStateMsg(InternalMessagePt
switch (msg->GetMessageName()) {
case WIFI_CURE_CMD_WIFI6_SELFCURE:
ret = EXECUTED;
internetValue_ = msg->GetParam1();
isForceHttpCheck_ = msg->GetParam2();
pSelfCureStateMachine->SendMessage(WIFI_CURE_CMD_WIFI6_WITH_HTC_PERIODIC_ARP_DETECTED);
break;
case WIFI_CURE_CMD_WIFI6_BACKOFF_SELFCURE:
ret = EXECUTED;
internetValue_ = msg->GetParam1();
isForceHttpCheck_ = msg->GetParam2();
pSelfCureStateMachine->SendMessage(WIFI_CURE_CMD_WIFI6_WITHOUT_HTC_PERIODIC_ARP_DETECTED);
break;
case WIFI_CURE_CMD_WIFI6_WITH_HTC_PERIODIC_ARP_DETECTED:
@ -1986,8 +1997,8 @@ void SelfCureStateMachine::Wifi6SelfCureState::PeriodicWifi6WithHtcArpDetect(Int
WIFI_LOGI("wifi6 with htc arp detect success");
wifi6HtcArpDetectionFailedCnt = 0;
pSelfCureStateMachine->isWifi6ArpSuccess = true;
pSelfCureStateMachine->MessageExecutedLater(WIFI_CURE_CMD_INTERNET_FAILURE_DETECTED, 0, 0,
SELF_CURE_DELAYED_MS);
pSelfCureStateMachine->MessageExecutedLater(WIFI_CURE_CMD_INTERNET_FAILURE_DETECTED, internetValue_,
isForceHttpCheck_, 0);
pSelfCureStateMachine->SwitchState(pSelfCureStateMachine->pConnectedMonitorState);
return;
}
@ -2015,8 +2026,8 @@ void SelfCureStateMachine::Wifi6SelfCureState::PeriodicWifi6WithoutHtcArpDetect(
wifi6ArpDetectionFailedCnt = 0;
pSelfCureStateMachine->isWifi6ArpSuccess = true;
if (!pSelfCureStateMachine->IsHttpReachable()) {
pSelfCureStateMachine->MessageExecutedLater(WIFI_CURE_CMD_INTERNET_FAILURE_DETECTED, 0, 0,
SELF_CURE_DELAYED_MS);
pSelfCureStateMachine->MessageExecutedLater(WIFI_CURE_CMD_INTERNET_FAILURE_DETECTED, internetValue_,
isForceHttpCheck_, SELF_CURE_DELAYED_MS);
} else {
pSelfCureStateMachine->selfCureOnGoing = false;
}
@ -2748,22 +2759,24 @@ void SelfCureStateMachine::PeriodicArpDetection()
bool SelfCureStateMachine::ShouldTransToWifi6SelfCure(InternalMessagePtr msg, std::string currConnectedBssid)
{
WIFI_LOGI("enter ShouldTransToWifi6SelfCure");
if (currConnectedBssid.empty()) {
if (currConnectedBssid.empty() || msg== nullptr) {
WIFI_LOGE("currConnectedBssid is empty or msg is nullptr");
return false;
}
if (!IsWifi6Network(currConnectedBssid) || isWifi6ArpSuccess || GetCurrentRssi() < MIN_VAL_LEVEL_3) {
return false;
}
int32_t arg = internetUnknown ? 1 : 0;
std::map<std::string, WifiCategoryBlackListInfo> wifi6BlackListCache;
WifiConfigCenter::GetInstance().GetWifiCategoryBlackListCache(EVENT_AX_BLA_LIST, wifi6BlackListCache);
if (wifi6BlackListCache.find(currConnectedBssid) == wifi6BlackListCache.end()) {
MessageExecutedLater(WIFI_CURE_CMD_WIFI6_SELFCURE, SELF_CURE_DELAYED_MS);
MessageExecutedLater(WIFI_CURE_CMD_WIFI6_SELFCURE, arg, msg->GetParam2(), SELF_CURE_DELAYED_MS);
SwitchState(pWifi6SelfCureState);
return true;
} else {
auto iter = wifi6BlackListCache.find(currConnectedBssid);
if (iter->second.actionType == 0) {
MessageExecutedLater(WIFI_CURE_CMD_WIFI6_BACKOFF_SELFCURE, SELF_CURE_DELAYED_MS);
MessageExecutedLater(WIFI_CURE_CMD_WIFI6_BACKOFF_SELFCURE, arg, msg->GetParam2(), SELF_CURE_DELAYED_MS);
SwitchState(pWifi6SelfCureState);
return true;
} else {

2
wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_self_cure/self_cure_state_machine.h
View File

@ -295,6 +295,8 @@ public:
SelfCureStateMachine *pSelfCureStateMachine;
int wifi6HtcArpDetectionFailedCnt = 0;
int wifi6ArpDetectionFailedCnt = 0;
int32_t internetValue_ = 0;
bool isForceHttpCheck_ = true;
void PeriodicWifi6WithHtcArpDetect(InternalMessagePtr msg);
void PeriodicWifi6WithoutHtcArpDetect(InternalMessagePtr msg);
void HandleWifi6WithHtcArpFail(InternalMessagePtr msg);