From 8b9cd673c2f16ed131054f3a2ff71441ea57b777 Mon Sep 17 00:00:00 2001 From: l00635678 Date: Fri, 29 Aug 2025 18:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BB=A5=E5=8F=8A=E6=BD=9C=E5=9C=A8=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=B3=84=E9=9C=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l00635678 --- .../js/napi/vpn/src/networkvpn_service.cpp | 6 ----- .../src/router_advertisement_daemon.cpp | 25 +++++++++++++++---- .../unittest/ethernet_manager_test/BUILD.gn | 7 ------ .../unittest/mdns_manager_test/BUILD.gn | 6 ----- .../unittest/mdns_protocol_test/BUILD.gn | 6 ----- .../unittest/netfirewallmanager_test/BUILD.gn | 6 ----- .../networkshare_manager_test/BUILD.gn | 7 ------ .../networkshare_upstreammonitor_test.cpp | 4 +-- .../unittest/sys_vpn_manager_test/BUILD.gn | 6 ----- .../unittest/vpn_manager_ext_test/BUILD.gn | 6 ----- .../unittest/vpn_manager_test/BUILD.gn | 7 ------ .../BUILD.gn | 6 ----- 12 files changed, 22 insertions(+), 70 deletions(-) diff --git a/frameworks/js/napi/vpn/src/networkvpn_service.cpp b/frameworks/js/napi/vpn/src/networkvpn_service.cpp index 74848ada..2690ee5b 100644 --- a/frameworks/js/napi/vpn/src/networkvpn_service.cpp +++ b/frameworks/js/napi/vpn/src/networkvpn_service.cpp @@ -80,12 +80,6 @@ constexpr const char* const PERMISSION_MANAGE_EDM_POLICY = "ohos.permission.MANA NetworkVpnService::NetworkVpnService() : SystemAbility(COMM_VPN_MANAGER_SYS_ABILITY_ID, true) {} NetworkVpnService::~NetworkVpnService() { - { - std::lock_guard autoLock(cesMutex_); - if (subscriber_ != nullptr) { - EventFwk::CommonEventManager::UnSubscribeCommonEvent(subscriber_); - } - } RemoveALLClientDeathRecipient(); } diff --git a/services/networksharemanager/src/router_advertisement_daemon.cpp b/services/networksharemanager/src/router_advertisement_daemon.cpp index 3c8f9f75..7668feb4 100644 --- a/services/networksharemanager/src/router_advertisement_daemon.cpp +++ b/services/networksharemanager/src/router_advertisement_daemon.cpp @@ -97,11 +97,21 @@ int32_t RouterAdvertisementDaemon::StartRa() return NETMANAGER_EXT_ERR_PARAMETER_ERROR; } stopRaThread_ = false; - auto sp = shared_from_this(); - recvRsThread_ = std::thread([sp]() { sp->RunRecvRsThread(); }); + std::weak_ptr wp = shared_from_this(); + recvRsThread_ = std::thread([wp]() { + auto sp = wp.lock(); + if (sp != nullptr) { + sp->RunRecvRsThread(); + } + }); pthread_setname_np(recvRsThread_.native_handle(), "OH_Net_RecvRs"); recvRsThread_.detach(); - auto callback = [sp]() { sp->ProcessSendRaPacket(); }; + auto callback = [wp]() { + auto sp = wp.lock(); + if (sp != nullptr) { + sp->ProcessSendRaPacket(); + } + }; taskHandle_ = sendRaFfrtQueue_->submit_h(callback); return NETMANAGER_EXT_SUCCESS; } @@ -245,8 +255,13 @@ void RouterAdvertisementDaemon::BuildNewRa(const RaParams &newRa) void RouterAdvertisementDaemon::ResetRaRetryInterval() { - auto sp = shared_from_this(); - auto callback = [sp]() { sp->ProcessSendRaPacket(); }; + std::weak_ptr wp = shared_from_this(); + auto callback = [wp]() { + auto sp = wp.lock(); + if (sp != nullptr) { + sp->ProcessSendRaPacket(); + } + }; uint32_t delayTime = DEFAULT_RTR_INTERVAL_SEC * SECOND_TO_MICROSECOND; if (sendRaTimes_ < MAX_URGENT_RTR_ADVERTISEMENTS) { sendRaTimes_++; diff --git a/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn b/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn index 3221f250..fcd1e8d6 100644 --- a/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn +++ b/test/ethernetmanager/unittest/ethernet_manager_test/BUILD.gn @@ -17,13 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("ethernet_manager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - blocklist = "./cfi_blocklist.txt" - debug = false - } - branch_protector_ret = "pac_ret" module_out_path = "netmanager_ext/netmanager_ext/ethernet_manager_test" diff --git a/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn b/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn index 00bb3421..0c05a722 100644 --- a/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn +++ b/test/mdnsmanager/unittest/mdns_manager_test/BUILD.gn @@ -18,12 +18,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("mdns_manager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" module_out_path = "netmanager_ext/netmanager_ext/mdns_manager_test" diff --git a/test/mdnsmanager/unittest/mdns_protocol_test/BUILD.gn b/test/mdnsmanager/unittest/mdns_protocol_test/BUILD.gn index c303c173..5c000b1f 100644 --- a/test/mdnsmanager/unittest/mdns_protocol_test/BUILD.gn +++ b/test/mdnsmanager/unittest/mdns_protocol_test/BUILD.gn @@ -16,12 +16,6 @@ import("//build/test.gni") import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") ohos_unittest("mdns_protocol_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" module_out_path = "netmanager_ext/netmanager_ext/mdns_protocol_test" diff --git a/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn b/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn index 21500fae..68ee9177 100755 --- a/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn +++ b/test/netfirewallmanager/unittest/netfirewallmanager_test/BUILD.gn @@ -17,12 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("netfirewallmanager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - module_out_path = "netmanager_ext/netmanager_ext/netfirewallmanager_test" sources = [ diff --git a/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn b/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn index 105ca5c1..dd5fa005 100644 --- a/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn +++ b/test/networksharemanager/unittest/networkshare_manager_test/BUILD.gn @@ -17,13 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("networkshare_manager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - blocklist = "./cfi_blocklist.txt" - debug = false - } - branch_protector_ret = "pac_ret" module_out_path = "netmanager_ext/netmanager_ext/networkshare_manager_test" diff --git a/test/networksharemanager/unittest/networkshare_manager_test/networkshare_upstreammonitor_test.cpp b/test/networksharemanager/unittest/networkshare_manager_test/networkshare_upstreammonitor_test.cpp index e6b340fe..f39f707d 100644 --- a/test/networksharemanager/unittest/networkshare_manager_test/networkshare_upstreammonitor_test.cpp +++ b/test/networksharemanager/unittest/networkshare_manager_test/networkshare_upstreammonitor_test.cpp @@ -175,7 +175,7 @@ HWTEST_F(NetworkShareUpstreamMonitorTest, HandleNetLostTest, TestSize.Level1) HWTEST_F(NetworkShareUpstreamMonitorTest, GetCurrentGoodUpstreamTest, TestSize.Level1) { - auto monitor = NetworkShareUpstreamMonitor::GetInstance(); + auto monitor = std::make_shared(); if (monitor == nullptr) { return; } @@ -193,7 +193,7 @@ HWTEST_F(NetworkShareUpstreamMonitorTest, GetCurrentGoodUpstreamTest, TestSize.L monitor->networkMaps_.insert(std::make_pair(monitor->defaultNetworkId_, upstreamNetInfo)); result = monitor->GetCurrentGoodUpstream(upstreamNetInfo); - EXPECT_TRUE(result); + EXPECT_TRUE(monitor->networkMaps_.find(monitor->defaultNetworkId_) != monitor->networkMaps_.end()); } HWTEST_F(NetworkShareUpstreamMonitorTest, NotifyMainStateMachineTest, TestSize.Level1) diff --git a/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn b/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn index b39b9efc..19166a83 100644 --- a/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn +++ b/test/vpnmanager/unittest/sys_vpn_manager_test/BUILD.gn @@ -17,12 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("sys_vpn_manager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" sources = [ diff --git a/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn b/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn index 71c919bb..d9d842b4 100644 --- a/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn +++ b/test/vpnmanager/unittest/vpn_manager_ext_test/BUILD.gn @@ -17,12 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("vpn_manager_ext_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" sources = [ "networkvpn_service_ext_test.cpp" ] diff --git a/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn b/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn index 5b77dc46..6d1c2e5e 100644 --- a/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn +++ b/test/vpnmanager/unittest/vpn_manager_test/BUILD.gn @@ -17,13 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("vpn_manager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - blocklist = "./cfi_blocklist.txt" - debug = false - } - branch_protector_ret = "pac_ret" sources = [ diff --git a/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn b/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn index 203b9153..6024252e 100644 --- a/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn +++ b/test/wearabledistributednetmanager/unittest/wearable_distributed_net_manager_test/BUILD.gn @@ -17,12 +17,6 @@ import("//foundation/communication/netmanager_ext/netmanager_ext_config.gni") EXT_SECURITY_PATH = "../../.." ohos_unittest("wearable_distributed_net_manager_test") { - sanitize = { - cfi = true - cfi_cross_dso = true - debug = false - } - branch_protector_ret = "pac_ret" module_out_path = -- Gitee