From daea50eee4d21df84ac12fbae3858aea044e9cde Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 03:41:34 +0000 Subject: [PATCH 01/10] modify Signed-off-by: chenqiwei --- .../wifi_framework/wifi_manage/wifi_sta/BUILD.gn | 6 ++++++ .../wifi_framework/wifi_manage/wifi_sta_new/BUILD.gn | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 0bf3248f5..ba1cf6819 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -66,6 +66,7 @@ local_base_include_dirs = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_self_cure", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_p2p", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_pro", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect", ] if (defined(ohos_lite)) { @@ -217,6 +218,11 @@ if (defined(ohos_lite)) { defines += [ "EXTENSIBLE_AUTHENTICATION" ] external_deps += ["netmanager_ext:ethernet_manager_if",] } + + if (wifi_feature_with_security_detect) { + defines += [ "WIFI_SECURITY_DETECT_ENABLE" ] + external_deps += [ "data_share:datashare_consumer" ] + } if (defined(global_parts_info) && defined(global_parts_info.telephony_core_service) && diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_new/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_new/BUILD.gn index ecc6a0a36..5d32a0ff8 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_new/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_new/BUILD.gn @@ -148,6 +148,18 @@ ohos_unittest("wifi_sta_new_unittest") { "FEATURE_SELF_CURE_SUPPORT", ] + if (wifi_feature_with_security_detect) { + external_deps += [ + "data_share:datashare_consumer", + "security_guard:libsg_classify_sdk", + ] + defines += [ "WIFI_SECURITY_DETECT_ENABLE" ] + sources += [ + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp", + "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect_observer.cpp", + ] + } + part_name = "wifi" subsystem_name = "communication" testonly = true -- Gitee From f723e89777535e1c5927d3b7dbddf005449c26c6 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 03:42:05 +0000 Subject: [PATCH 02/10] modify Signed-off-by: chenqiwei --- .../wifi_manage/network_select/wifi_scorer_impl.cpp | 13 +++++++++++++ .../wifi_manage/network_select/wifi_scorer_impl.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.cpp index a035eb989..557ae4007 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.cpp @@ -48,6 +48,7 @@ constexpr int MIN_RSSI = -128; constexpr int INTERNET_ACCESS_AWARD = 2; constexpr int EMPTY_NETWORK_STATUS_HISTORY_AWARD = 1; constexpr int MAX_HISTORY_NETWORK_STATUS_NUM = 10; +constexpr int WIFI_SECURE_SCORE = 1; constexpr int HISTORY_NETWORK_STATUS_WEIGHTED_SCORE[MAX_HISTORY_NETWORK_STATUS_NUM] = { 81920, 40960, 20480, 10240, 5120, 2560, 1280, 640, 320, 160}; } @@ -229,6 +230,17 @@ double RssiLevelBonusScorer::Score(NetworkCandidate &networkCandidate) return 0; } +WifiExtScorer::WifiExtScorer() : SimpleWifiScorer("WifiExtScorer") {} + +double WifiExtScorer::Score(NetworkCandidate &networkCandidate) +{ + int32_t levelScore = 0; + if (networkCandidate.wifiDeviceConfig.isSecureWifi) { + levelScore += WIFI_SECURE_SCORE; + } + return levelScore; +} + SignalLevelScorer::SignalLevelScorer() : SimpleWifiScorer("SignalLevelScorer") {} double SignalLevelScorer::Score(NetworkCandidate &networkCandidate) @@ -267,6 +279,7 @@ SavedNetworkScorer::SavedNetworkScorer(const std::string &scorerName) : Composit AddScorer(std::make_shared()); AddScorer(std::make_shared()); AddScorer(std::make_shared()); + AddScorer(std::make_shared()); ExternalWifiCommonBuildManager::GetInstance().BuildScore( TagType::HAS_INTERNET_NETWORK_SELECTOR_SCORE_WIFI_CATEGORY_TAG, *this); } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.h index 5136c9f93..aa680fe83 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.h @@ -137,6 +137,12 @@ public: double Score(NetworkCandidate &networkCandidate) override; }; +class WifiExtScorer : public SimpleWifiScorer { +public: + WifiExtScorer(); + double Score(NetworkCandidate &networkCandidate) override; +}; + class SignalLevelScorer : public SimpleWifiScorer { public: SignalLevelScorer(); -- Gitee From 955494a43d3320587a8aa05ba876411dfbed5e4e Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 03:42:14 +0000 Subject: [PATCH 03/10] modify Signed-off-by: chenqiwei --- .../wifi_security_detect.cpp | 29 +++++++++++++++++-- .../wifi_security_detect.h | 2 ++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp index b4630aafd..e7f96f024 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp @@ -59,12 +59,15 @@ WifiSecurityDetect::WifiSecurityDetect() void WifiSecurityDetect::DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info, int instId) { - if (state == OperateResState::CONNECT_AP_CONNECTED) { - currentConnectedNetworkId_ = info.networkId; - SecurityDetect(info); + if (state == OperateResState::CONNECT_NETWORK_ENABLED) { + if (!networkDetecting_.load()) { + networkDetecting_.store(true); + SecurityDetect(info); + } } else if (state == OperateResState::DISCONNECT_DISCONNECTED) { PopupNotification(WifiNotification::CLOSE, info.networkId); currentConnectedNetworkId_ = -1; + networkDetecting_.store(false); } else { return; } @@ -80,6 +83,11 @@ void WifiSecurityDetect::SetDatashareReady() datashareReady_ = true; } +void WifiSecurityDetect::SetChangeNetworkid(int networkId) +{ + currentConnectedNetworkId_ = networkId; +} + std::shared_ptr WifiSecurityDetect::CreateDataShareHelper() { auto remote = sptr(new (std::nothrow) IRemoteStub()); @@ -185,6 +193,7 @@ ErrCode WifiSecurityDetect::SecurityDetectResult( SecurityModelResult model = future.get(); return SecurityModelJsonResult(model, result); } else { + WIFI_LOGE("RequestSecurityModelResultSync timeout"); return WIFI_OPT_FAILED; } } @@ -394,6 +403,20 @@ void WifiSecurityDetect::PopupNotification(int status, int networkid) std::string bundleName = WifiSettings::GetInstance().GetPackageName("SECURITY_BUNDLE"); want.SetElementName(bundleName, "WlanNotificationAbility"); if (status == 1) { + if (!IsSettingSecurityDetectOn()) { + WIFI_LOGI("The SecurityDetect is off"); + return; + } + if (networkid == -1) { + WIFI_LOGI("The networkid is off"); + return; + } + if (currentConnectedNetworkId_ != networkid) { + WIFI_LOGI("The networkid is changed current networkid:%{public}d detect networkid:%{public}d", + currentConnectedNetworkId_, + networkid); + return; + } want.SetParam("notificationType", WifiNotification::OPEN); } else { want.SetParam("notificationType", WifiNotification::CLOSE); diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h index d4915d865..ed5e9cf6b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h @@ -71,6 +71,7 @@ public: bool IsSettingSecurityDetectOn(); Uri AssembleUri(const std::string &key); void SetDatashareReady(); + void SetChangeNetworkid(int networkid); void RegisterSecurityDetectObserver(); void SecurityDetect(const WifiLinkedInfo &info); void PopupNotification(int status, int networkid); @@ -80,6 +81,7 @@ private: StaServiceCallback staCallback_; int currentConnectedNetworkId_ = -1; std::atomic datashareReady_ {false}; + std::atomic networkDetecting_ {false}; std::mutex shareSecurityObserverMutex_; std::atomic isSecurityDetectObservered_ {false}; void DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info, int instId); -- Gitee From ae477839300b89e59f41493a0d62288fc8b9df5f Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 14:51:16 +0800 Subject: [PATCH 04/10] chen Signed-off-by: chenqiwei --- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 6 ++++++ wifi/wifi.gni | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index f4fd08d43..c1f4da0be 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -43,6 +43,9 @@ #ifdef WIFI_CONFIG_UPDATE #include "wifi_config_update.h" #endif +#ifdef WIFI_SECURITY_DETECT_ENABLE +#include "wifi_security_detect.h" +#endif #include "wifi_notification_util.h" #include "wifi_net_stats_manager.h" #include "wifi_history_record_manager.h" @@ -4386,6 +4389,9 @@ ErrCode StaStateMachine::StartConnectToNetwork(int networkId, const std::string BlockConnectService::GetInstance().EnableNetworkSelectStatus(networkId); #ifndef OHOS_ARCH_LITE BlockConnectService::GetInstance().ReleaseUnusableBssidSet(); +#ifdef WIFI_SECURITY_DETECT_ENABLE + WifiSecurityDetect::GetInstance().SetChangeNetworkid(networkId); +#endif #endif WifiSettings::GetInstance().SetUserConnectChoice(networkId); } diff --git a/wifi/wifi.gni b/wifi/wifi.gni index b74abb488..7f5a73019 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -62,7 +62,7 @@ declare_args() { wifi_feature_mdm_restricted_enable = true wifi_feature_with_extensible_authentication = false wifi_feature_with_scan_control_action_listen = true - wifi_feature_autoopen_specified_location = false + wifi_feature_autoopen_specified_location = true } memory_optimization_cflags = [ -- Gitee From 81b27040e1ba6e72ff081d683e9cdf553083526c Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 07:02:58 +0000 Subject: [PATCH 05/10] modify Signed-off-by: chenqiwei --- wifi/wifi.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/wifi.gni b/wifi/wifi.gni index 7f5a73019..b74abb488 100644 --- a/wifi/wifi.gni +++ b/wifi/wifi.gni @@ -62,7 +62,7 @@ declare_args() { wifi_feature_mdm_restricted_enable = true wifi_feature_with_extensible_authentication = false wifi_feature_with_scan_control_action_listen = true - wifi_feature_autoopen_specified_location = true + wifi_feature_autoopen_specified_location = false } memory_optimization_cflags = [ -- Gitee From bf4affdd9530676633ca71fec19d4509f3fc85e5 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 08:21:14 +0000 Subject: [PATCH 06/10] modify Signed-off-by: chenqiwei --- .../wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp index 7c1bf1825..8fa5a0947 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp @@ -21,7 +21,7 @@ namespace Wifi { HWTEST_F(WifiSecurityDetectTest, DealStaConnChangedTest01, TestSize.Level1) { - OperateResState state = OperateResState::CONNECT_AP_CONNECTED; + OperateResState state = OperateResState::CONNECT_NETWORK_ENABLED; WifiLinkedInfo info; info.networkId = 1; int instId = 1; -- Gitee From 363e696194c98378f43e7ecf5c6e13838f436fc6 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Fri, 18 Jul 2025 08:28:54 +0000 Subject: [PATCH 07/10] modify Signed-off-by: chenqiwei --- .../wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp index 8fa5a0947..b18a03aaf 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta_ext/wifi_security_detect_test.cpp @@ -26,7 +26,7 @@ HWTEST_F(WifiSecurityDetectTest, DealStaConnChangedTest01, TestSize.Level1) info.networkId = 1; int instId = 1; wifiSecurityDetect_->DealStaConnChanged(state, info, instId); - EXPECT_EQ(wifiSecurityDetect_->currentConnectedNetworkId_, info.networkId); + EXPECT_EQ(wifiSecurityDetect_->networkDetecting_, true); } HWTEST_F(WifiSecurityDetectTest, DealStaConnChangedTest02, TestSize.Level1) -- Gitee From 1bc549a264f67477ea94011cf7ccb5fbe3bd9728 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Sat, 19 Jul 2025 08:06:47 +0000 Subject: [PATCH 08/10] modify Signed-off-by: chenqiwei --- .../wifi_security_detect/wifi_security_detect.cpp | 7 +++++-- .../wifi_security_detect/wifi_security_detect.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp index e7f96f024..23dc699c0 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp @@ -60,11 +60,13 @@ WifiSecurityDetect::WifiSecurityDetect() void WifiSecurityDetect::DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info, int instId) { if (state == OperateResState::CONNECT_NETWORK_ENABLED) { + std::unique_lock lock(shareDetectMutex_); if (!networkDetecting_.load()) { networkDetecting_.store(true); SecurityDetect(info); } } else if (state == OperateResState::DISCONNECT_DISCONNECTED) { + std::unique_lock lock(shareDetectMutex_); PopupNotification(WifiNotification::CLOSE, info.networkId); currentConnectedNetworkId_ = -1; networkDetecting_.store(false); @@ -85,6 +87,7 @@ void WifiSecurityDetect::SetDatashareReady() void WifiSecurityDetect::SetChangeNetworkid(int networkId) { + std::unique_lock lock(shareDetectMutex_); currentConnectedNetworkId_ = networkId; } @@ -412,8 +415,8 @@ void WifiSecurityDetect::PopupNotification(int status, int networkid) return; } if (currentConnectedNetworkId_ != networkid) { - WIFI_LOGI("The networkid is changed current networkid:%{public}d detect networkid:%{public}d", - currentConnectedNetworkId_, + WIFI_LOGI("The networkid is changed current networkid:%{public}d detect networkid:%{public}d", + currentConnectedNetworkId_.load(), networkid); return; } diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h index ed5e9cf6b..5211df541 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.h @@ -79,10 +79,11 @@ public: private: std::unique_ptr securityDetectThread_ = nullptr; StaServiceCallback staCallback_; - int currentConnectedNetworkId_ = -1; + std::atomic currentConnectedNetworkId_ {-1}; std::atomic datashareReady_ {false}; std::atomic networkDetecting_ {false}; std::mutex shareSecurityObserverMutex_; + std::mutex shareDetectMutex_; std::atomic isSecurityDetectObservered_ {false}; void DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info, int instId); bool IsSecurityDetectTimeout(const int &networkId); -- Gitee From d071a4e579832e9f8fb2e99cfb21200d70950d91 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Sat, 19 Jul 2025 14:25:00 +0000 Subject: [PATCH 09/10] modify Signed-off-by: chenqiwei --- .../wifi_security_detect/wifi_security_detect.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp index 23dc699c0..fea977385 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp @@ -59,16 +59,15 @@ WifiSecurityDetect::WifiSecurityDetect() void WifiSecurityDetect::DealStaConnChanged(OperateResState state, const WifiLinkedInfo &info, int instId) { + std::unique_lock lock(shareDetectMutex_); if (state == OperateResState::CONNECT_NETWORK_ENABLED) { - std::unique_lock lock(shareDetectMutex_); if (!networkDetecting_.load()) { networkDetecting_.store(true); SecurityDetect(info); } } else if (state == OperateResState::DISCONNECT_DISCONNECTED) { - std::unique_lock lock(shareDetectMutex_); PopupNotification(WifiNotification::CLOSE, info.networkId); - currentConnectedNetworkId_ = -1; + currentConnectedNetworkId_.store(-1); networkDetecting_.store(false); } else { return; @@ -82,13 +81,12 @@ StaServiceCallback WifiSecurityDetect::GetStaCallback() const void WifiSecurityDetect::SetDatashareReady() { - datashareReady_ = true; + datashareReady_.store(true); } void WifiSecurityDetect::SetChangeNetworkid(int networkId) { - std::unique_lock lock(shareDetectMutex_); - currentConnectedNetworkId_ = networkId; + currentConnectedNetworkId_.store(networkId); } std::shared_ptr WifiSecurityDetect::CreateDataShareHelper() @@ -414,7 +412,7 @@ void WifiSecurityDetect::PopupNotification(int status, int networkid) WIFI_LOGI("The networkid is off"); return; } - if (currentConnectedNetworkId_ != networkid) { + if (currentConnectedNetworkId_.load() != networkid) { WIFI_LOGI("The networkid is changed current networkid:%{public}d detect networkid:%{public}d", currentConnectedNetworkId_.load(), networkid); -- Gitee From 756823928235ca6b032bd6ebd39552efad322039 Mon Sep 17 00:00:00 2001 From: chenqiwei Date: Sat, 19 Jul 2025 16:06:11 +0000 Subject: [PATCH 10/10] modify Signed-off-by: chenqiwei --- .../wifi_manage/wifi_security_detect/wifi_security_detect.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp index fea977385..97a4368ce 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_security_detect/wifi_security_detect.cpp @@ -61,6 +61,7 @@ void WifiSecurityDetect::DealStaConnChanged(OperateResState state, const WifiLin { std::unique_lock lock(shareDetectMutex_); if (state == OperateResState::CONNECT_NETWORK_ENABLED) { + currentConnectedNetworkId_ = info.networkId; if (!networkDetecting_.load()) { networkDetecting_.store(true); SecurityDetect(info); -- Gitee