From d29818291268ae82fdb6cd36a43342561c261952 Mon Sep 17 00:00:00 2001 From: l00635678 Date: Tue, 24 Jun 2025 21:53:13 +0800 Subject: [PATCH] =?UTF-8?q?QQ=E9=98=85=E8=AF=BB=E6=9C=89=E5=8D=A1=E6=AD=BB?= =?UTF-8?q?=E7=9A=84=E7=8E=B0=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l00635678 --- .../context/get_all_active_ifaces_context.cpp | 3 ++- .../context/get_all_active_ifaces_context.h | 2 +- .../context/get_device_infomation.cpp | 2 +- .../ethernet/context/get_device_infomation.h | 2 +- .../context/get_iface_config_context.cpp | 3 ++- .../context/get_iface_config_context.h | 2 +- .../context/get_mac_address_context.cpp | 3 ++- .../context/get_mac_address_context.h | 2 +- .../context/is_iface_active_context.cpp | 3 ++- .../context/is_iface_active_context.h | 2 +- .../context/set_iface_config_context.cpp | 3 ++- .../context/set_iface_config_context.h | 2 +- .../interface_state_observer_wrapper.cpp | 7 ++----- .../interface_state_observer_wrapper.h | 4 ++-- .../contexts/mdns_addlocalservice_context.h | 2 +- .../mdns/include/contexts/mdns_base_context.h | 2 +- .../mdns_removelocalservice_context.h | 2 +- .../mdns_resolvelocalservice_context.h | 2 +- .../contexts/mdns_startsearching_context.h | 2 +- .../js/napi/mdns/include/mdns_instances.h | 8 +++---- .../contexts/mdns_addlocalservice_context.cpp | 2 +- .../mdns/src/contexts/mdns_base_context.cpp | 2 +- .../mdns_removelocalservice_context.cpp | 2 +- .../mdns_resolvelocalservice_context.cpp | 2 +- .../contexts/mdns_startsearching_context.cpp | 3 ++- .../js/napi/mdns/src/mdns_instances.cpp | 6 +++--- frameworks/js/napi/mdns/src/mdns_module.cpp | 21 ++++++++++++------- .../context/add_netfirewall_rule_context.h | 2 +- .../context/delete_netfirewall_rule_context.h | 2 +- .../get_all_intercept_records_context.h | 2 +- .../get_all_netfirewall_rules_context.h | 2 +- .../context/get_netfirewall_policy_context.h | 2 +- .../context/get_netfirewall_rule_context.h | 2 +- .../context/set_netfirewall_policy_context.h | 2 +- .../context/update_netfirewall_rule_context.h | 2 +- .../context/add_netfirewall_rule_context.cpp | 3 ++- .../delete_netfirewall_rule_context.cpp | 2 +- .../get_all_intercept_records_context.cpp | 2 +- .../get_all_netfirewall_rules_context.cpp | 2 +- .../get_netfirewall_policy_context.cpp | 2 +- .../context/get_netfirewall_rule_context.cpp | 3 ++- .../set_netfirewall_policy_context.cpp | 2 +- .../update_netfirewall_rule_context.cpp | 2 +- .../include/netshare_issharing_context.h | 2 +- .../include/netshare_observer_wrapper.h | 4 ++-- .../include/netshare_startsharing_context.h | 2 +- .../src/netshare_issharing_context.cpp | 3 ++- .../sharing/src/netshare_observer_wrapper.cpp | 12 +++-------- .../src/netshare_startsharing_context.cpp | 2 +- .../js/napi/vpn/include/context/add_context.h | 2 +- .../napi/vpn/include/context/delete_context.h | 2 +- .../vpn/include/context/destroy_context.h | 2 +- .../include/context/get_app_info_context.h | 2 +- .../include/context/get_connected_context.h | 2 +- .../js/napi/vpn/include/context/get_context.h | 2 +- .../vpn/include/context/get_list_context.h | 2 +- .../vpn/include/context/prepare_context.h | 2 +- .../vpn/include/context/protect_context.h | 2 +- .../napi/vpn/include/context/setup_context.h | 2 +- frameworks/js/napi/vpn/include/vpn_monitor.h | 4 ++-- .../js/napi/vpn/src/context/add_context.cpp | 2 +- .../napi/vpn/src/context/delete_context.cpp | 2 +- .../napi/vpn/src/context/destroy_context.cpp | 2 +- .../vpn/src/context/get_app_info_context.cpp | 3 ++- .../vpn/src/context/get_connected_context.cpp | 3 ++- .../js/napi/vpn/src/context/get_context.cpp | 2 +- .../napi/vpn/src/context/get_list_context.cpp | 2 +- .../napi/vpn/src/context/prepare_context.cpp | 2 +- .../napi/vpn/src/context/protect_context.cpp | 2 +- .../js/napi/vpn/src/context/setup_context.cpp | 2 +- frameworks/js/napi/vpn/src/vpn_module.cpp | 2 +- frameworks/js/napi/vpn/src/vpn_monitor.cpp | 10 ++------- .../include/context/destroy_context_ext.h | 2 +- .../context/generate_vpnId_context_ext.h | 2 +- .../include/context/prepare_context_ext.h | 2 +- .../include/context/protect_context_ext.h | 2 +- .../include/context/setup_context_ext.h | 2 +- .../vpnext/include/context/vpn_context_ext.h | 2 +- .../js/napi/vpnext/include/vpn_monitor_ext.h | 4 ++-- .../src/context/destroy_context_ext.cpp | 2 +- .../context/generate_vpnId_context_ext.cpp | 3 ++- .../src/context/prepare_context_ext.cpp | 2 +- .../src/context/protect_context_ext.cpp | 2 +- .../vpnext/src/context/setup_context_ext.cpp | 2 +- .../js/napi/vpnext/src/vpn_module_ext.cpp | 2 +- 85 files changed, 122 insertions(+), 120 deletions(-) diff --git a/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.cpp b/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.cpp index a7b9998c..65093272 100644 --- a/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.cpp +++ b/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.cpp @@ -19,7 +19,8 @@ namespace OHOS { namespace NetManagerStandard { -GetAllActiveIfacesContext::GetAllActiveIfacesContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetAllActiveIfacesContext::GetAllActiveIfacesContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GetAllActiveIfacesContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.h b/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.h index 63380809..68f1c796 100644 --- a/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.h +++ b/frameworks/js/napi/ethernet/context/get_all_active_ifaces_context.h @@ -30,7 +30,7 @@ namespace NetManagerStandard { class GetAllActiveIfacesContext : public BaseContext { public: GetAllActiveIfacesContext() = delete; - explicit GetAllActiveIfacesContext(napi_env env, EventManager *manager); + explicit GetAllActiveIfacesContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/ethernet/context/get_device_infomation.cpp b/frameworks/js/napi/ethernet/context/get_device_infomation.cpp index 5029f44c..e9fa7ed7 100644 --- a/frameworks/js/napi/ethernet/context/get_device_infomation.cpp +++ b/frameworks/js/napi/ethernet/context/get_device_infomation.cpp @@ -19,7 +19,7 @@ namespace OHOS { namespace NetManagerStandard { -GetDeviceInformationContext::GetDeviceInformationContext(napi_env env, EventManager *manager) +GetDeviceInformationContext::GetDeviceInformationContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void GetDeviceInformationContext::ParseParams(napi_value *params, size_t paramsCount) diff --git a/frameworks/js/napi/ethernet/context/get_device_infomation.h b/frameworks/js/napi/ethernet/context/get_device_infomation.h index 350b4166..ca9cfdea 100644 --- a/frameworks/js/napi/ethernet/context/get_device_infomation.h +++ b/frameworks/js/napi/ethernet/context/get_device_infomation.h @@ -27,7 +27,7 @@ namespace NetManagerStandard { class GetDeviceInformationContext : public BaseContext { public: GetDeviceInformationContext() = delete; - explicit GetDeviceInformationContext(napi_env env, EventManager *manager); + explicit GetDeviceInformationContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/ethernet/context/get_iface_config_context.cpp b/frameworks/js/napi/ethernet/context/get_iface_config_context.cpp index abb669ac..11929e2e 100644 --- a/frameworks/js/napi/ethernet/context/get_iface_config_context.cpp +++ b/frameworks/js/napi/ethernet/context/get_iface_config_context.cpp @@ -34,7 +34,8 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -GetIfaceConfigContext::GetIfaceConfigContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetIfaceConfigContext::GetIfaceConfigContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GetIfaceConfigContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/ethernet/context/get_iface_config_context.h b/frameworks/js/napi/ethernet/context/get_iface_config_context.h index a56c25b2..9a612bcb 100644 --- a/frameworks/js/napi/ethernet/context/get_iface_config_context.h +++ b/frameworks/js/napi/ethernet/context/get_iface_config_context.h @@ -31,7 +31,7 @@ namespace NetManagerStandard { class GetIfaceConfigContext : public BaseContext { public: GetIfaceConfigContext() = delete; - explicit GetIfaceConfigContext(napi_env env, EventManager *manager); + explicit GetIfaceConfigContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/ethernet/context/get_mac_address_context.cpp b/frameworks/js/napi/ethernet/context/get_mac_address_context.cpp index 08d8bd22..282f34da 100644 --- a/frameworks/js/napi/ethernet/context/get_mac_address_context.cpp +++ b/frameworks/js/napi/ethernet/context/get_mac_address_context.cpp @@ -21,7 +21,8 @@ namespace OHOS { namespace NetManagerStandard { -GetMacAddressContext::GetMacAddressContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetMacAddressContext::GetMacAddressContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GetMacAddressContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/ethernet/context/get_mac_address_context.h b/frameworks/js/napi/ethernet/context/get_mac_address_context.h index 9225a25d..2a97104b 100644 --- a/frameworks/js/napi/ethernet/context/get_mac_address_context.h +++ b/frameworks/js/napi/ethernet/context/get_mac_address_context.h @@ -31,7 +31,7 @@ namespace NetManagerStandard { class GetMacAddressContext : public BaseContext { public: GetMacAddressContext() = delete; - explicit GetMacAddressContext(napi_env env, EventManager *manager); + explicit GetMacAddressContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/ethernet/context/is_iface_active_context.cpp b/frameworks/js/napi/ethernet/context/is_iface_active_context.cpp index 0fd80958..692c24ab 100644 --- a/frameworks/js/napi/ethernet/context/is_iface_active_context.cpp +++ b/frameworks/js/napi/ethernet/context/is_iface_active_context.cpp @@ -34,7 +34,8 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -IsIfaceActiveContext::IsIfaceActiveContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +IsIfaceActiveContext::IsIfaceActiveContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void IsIfaceActiveContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/ethernet/context/is_iface_active_context.h b/frameworks/js/napi/ethernet/context/is_iface_active_context.h index 1aaa6299..1cd36400 100644 --- a/frameworks/js/napi/ethernet/context/is_iface_active_context.h +++ b/frameworks/js/napi/ethernet/context/is_iface_active_context.h @@ -30,7 +30,7 @@ namespace NetManagerStandard { class IsIfaceActiveContext : public BaseContext { public: IsIfaceActiveContext() = delete; - explicit IsIfaceActiveContext(napi_env env, EventManager *manager); + explicit IsIfaceActiveContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/ethernet/context/set_iface_config_context.cpp b/frameworks/js/napi/ethernet/context/set_iface_config_context.cpp index 591bb88d..48f28a9b 100644 --- a/frameworks/js/napi/ethernet/context/set_iface_config_context.cpp +++ b/frameworks/js/napi/ethernet/context/set_iface_config_context.cpp @@ -44,7 +44,8 @@ bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount) } } // namespace -SetIfaceConfigContext::SetIfaceConfigContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +SetIfaceConfigContext::SetIfaceConfigContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void SetIfaceConfigContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/ethernet/context/set_iface_config_context.h b/frameworks/js/napi/ethernet/context/set_iface_config_context.h index ad8f8507..f2cf7228 100644 --- a/frameworks/js/napi/ethernet/context/set_iface_config_context.h +++ b/frameworks/js/napi/ethernet/context/set_iface_config_context.h @@ -31,7 +31,7 @@ namespace NetManagerStandard { class SetIfaceConfigContext : public BaseContext { public: SetIfaceConfigContext() = delete; - explicit SetIfaceConfigContext(napi_env env, EventManager *manager); + explicit SetIfaceConfigContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/ethernet/interface_state_observer_wrapper.cpp b/frameworks/js/napi/ethernet/interface_state_observer_wrapper.cpp index 9fff3811..17c634cd 100644 --- a/frameworks/js/napi/ethernet/interface_state_observer_wrapper.cpp +++ b/frameworks/js/napi/ethernet/interface_state_observer_wrapper.cpp @@ -24,14 +24,11 @@ namespace OHOS { namespace NetManagerStandard { InterfaceStateObserverWrapper::InterfaceStateObserverWrapper() - : observer_(new InterfaceStateObserver()), manager_(new EventManager()), registered_(false) + : observer_(new InterfaceStateObserver()), manager_(std::make_shared()), registered_(false) { } -InterfaceStateObserverWrapper::~InterfaceStateObserverWrapper() -{ - delete manager_; -} +InterfaceStateObserverWrapper::~InterfaceStateObserverWrapper() = default; InterfaceStateObserverWrapper &InterfaceStateObserverWrapper::GetInstance() { diff --git a/frameworks/js/napi/ethernet/interface_state_observer_wrapper.h b/frameworks/js/napi/ethernet/interface_state_observer_wrapper.h index fe1c1552..a5e8bbda 100644 --- a/frameworks/js/napi/ethernet/interface_state_observer_wrapper.h +++ b/frameworks/js/napi/ethernet/interface_state_observer_wrapper.h @@ -40,7 +40,7 @@ public: static InterfaceStateObserverWrapper &GetInstance(); - EventManager *GetEventManager() const + std::shared_ptr GetEventManager() const { return manager_; } @@ -50,7 +50,7 @@ private: ~InterfaceStateObserverWrapper(); sptr observer_ = nullptr; - EventManager *manager_ = nullptr; + std::shared_ptr manager_ = nullptr; bool registered_ = false; }; } // namespace NetManagerStandard diff --git a/frameworks/js/napi/mdns/include/contexts/mdns_addlocalservice_context.h b/frameworks/js/napi/mdns/include/contexts/mdns_addlocalservice_context.h index 9a1e4b5b..c1b1fed4 100644 --- a/frameworks/js/napi/mdns/include/contexts/mdns_addlocalservice_context.h +++ b/frameworks/js/napi/mdns/include/contexts/mdns_addlocalservice_context.h @@ -30,7 +30,7 @@ class MDnsAddLocalServiceContext final : public MDnsBaseContext { public: DISALLOW_COPY_AND_MOVE(MDnsAddLocalServiceContext); MDnsAddLocalServiceContext() = delete; - explicit MDnsAddLocalServiceContext(napi_env env, EventManager *manager); + explicit MDnsAddLocalServiceContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); sptr GetObserver() const; diff --git a/frameworks/js/napi/mdns/include/contexts/mdns_base_context.h b/frameworks/js/napi/mdns/include/contexts/mdns_base_context.h index 73dede70..2a13317b 100644 --- a/frameworks/js/napi/mdns/include/contexts/mdns_base_context.h +++ b/frameworks/js/napi/mdns/include/contexts/mdns_base_context.h @@ -27,7 +27,7 @@ namespace NetManagerStandard { class MDnsBaseContext : public BaseContext { public: MDnsBaseContext() = delete; - explicit MDnsBaseContext(napi_env env, EventManager *manager); + explicit MDnsBaseContext(napi_env env, std::shared_ptr& manager); MDnsServiceInfo &GetServiceInfo(); void SetServiceInfo(const MDnsServiceInfo &info); diff --git a/frameworks/js/napi/mdns/include/contexts/mdns_removelocalservice_context.h b/frameworks/js/napi/mdns/include/contexts/mdns_removelocalservice_context.h index 0d910b0e..c5b51c55 100644 --- a/frameworks/js/napi/mdns/include/contexts/mdns_removelocalservice_context.h +++ b/frameworks/js/napi/mdns/include/contexts/mdns_removelocalservice_context.h @@ -27,7 +27,7 @@ class MDnsRemoveLocalServiceContext final : public MDnsBaseContext { public: DISALLOW_COPY_AND_MOVE(MDnsRemoveLocalServiceContext); MDnsRemoveLocalServiceContext() = delete; - explicit MDnsRemoveLocalServiceContext(napi_env env, EventManager *manager); + explicit MDnsRemoveLocalServiceContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); sptr GetObserver(); diff --git a/frameworks/js/napi/mdns/include/contexts/mdns_resolvelocalservice_context.h b/frameworks/js/napi/mdns/include/contexts/mdns_resolvelocalservice_context.h index 468e76c3..e0cb236f 100644 --- a/frameworks/js/napi/mdns/include/contexts/mdns_resolvelocalservice_context.h +++ b/frameworks/js/napi/mdns/include/contexts/mdns_resolvelocalservice_context.h @@ -30,7 +30,7 @@ class MDnsResolveLocalServiceContext final : public MDnsBaseContext { public: DISALLOW_COPY_AND_MOVE(MDnsResolveLocalServiceContext); MDnsResolveLocalServiceContext() = delete; - explicit MDnsResolveLocalServiceContext(napi_env env, EventManager *manager); + explicit MDnsResolveLocalServiceContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); sptr GetObserver(); diff --git a/frameworks/js/napi/mdns/include/contexts/mdns_startsearching_context.h b/frameworks/js/napi/mdns/include/contexts/mdns_startsearching_context.h index f9c03a20..0fafe480 100644 --- a/frameworks/js/napi/mdns/include/contexts/mdns_startsearching_context.h +++ b/frameworks/js/napi/mdns/include/contexts/mdns_startsearching_context.h @@ -27,7 +27,7 @@ class MDnsStartSearchingContext final : public BaseContext { public: DISALLOW_COPY_AND_MOVE(MDnsStartSearchingContext); MDnsStartSearchingContext() = delete; - explicit MDnsStartSearchingContext(napi_env env, EventManager *manager); + explicit MDnsStartSearchingContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); wptr GetObserver(); MDnsDiscoveryInstance GetDiscover(); diff --git a/frameworks/js/napi/mdns/include/mdns_instances.h b/frameworks/js/napi/mdns/include/mdns_instances.h index 9372c88c..300aaaec 100644 --- a/frameworks/js/napi/mdns/include/mdns_instances.h +++ b/frameworks/js/napi/mdns/include/mdns_instances.h @@ -28,9 +28,9 @@ public: MDnsDiscoveryInstance(); ~MDnsDiscoveryInstance() = default; [[nodiscard]] sptr GetObserver() const; - [[nodiscard]] EventManager *GetEventManager() const; + [[nodiscard]] std::shared_ptr GetEventManager() const; - static MDnsDiscoveryInstance *MakeMDnsDiscovery(EventManager *eventManager); + static MDnsDiscoveryInstance *MakeMDnsDiscovery(std::shared_ptr& eventManager); static void DeleteMDnsDiscovery(MDnsDiscoveryInstance *mDnsDiscovery); std::string context_; @@ -39,8 +39,8 @@ public: static std::map discoverInstanceMap_; private: - EventManager *manager_ = nullptr; - explicit MDnsDiscoveryInstance(EventManager *eventManager); + std::shared_ptr manager_ = nullptr; + explicit MDnsDiscoveryInstance(std::shared_ptr& eventManager); }; } // namespace OHOS::NetManagerStandard #endif /* NETMANAGER_EXT_MDNS_INSTANCES_H */ diff --git a/frameworks/js/napi/mdns/src/contexts/mdns_addlocalservice_context.cpp b/frameworks/js/napi/mdns/src/contexts/mdns_addlocalservice_context.cpp index 8900326b..3eaf17cc 100644 --- a/frameworks/js/napi/mdns/src/contexts/mdns_addlocalservice_context.cpp +++ b/frameworks/js/napi/mdns/src/contexts/mdns_addlocalservice_context.cpp @@ -24,7 +24,7 @@ namespace OHOS::NetManagerStandard { std::map> MDnsAddLocalServiceContext::registerCallbackMap_; std::mutex g_mDNSRegisterMutex; -MDnsAddLocalServiceContext::MDnsAddLocalServiceContext(napi_env env, EventManager *manager) +MDnsAddLocalServiceContext::MDnsAddLocalServiceContext(napi_env env, std::shared_ptr& manager) : MDnsBaseContext(env, manager) { } diff --git a/frameworks/js/napi/mdns/src/contexts/mdns_base_context.cpp b/frameworks/js/napi/mdns/src/contexts/mdns_base_context.cpp index f22bfe77..792c9b79 100644 --- a/frameworks/js/napi/mdns/src/contexts/mdns_base_context.cpp +++ b/frameworks/js/napi/mdns/src/contexts/mdns_base_context.cpp @@ -21,7 +21,7 @@ #include "mdns_common.h" namespace OHOS::NetManagerStandard { -MDnsBaseContext::MDnsBaseContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +MDnsBaseContext::MDnsBaseContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void MDnsBaseContext::ParseAddressObj(napi_env env, napi_value obj) { diff --git a/frameworks/js/napi/mdns/src/contexts/mdns_removelocalservice_context.cpp b/frameworks/js/napi/mdns/src/contexts/mdns_removelocalservice_context.cpp index 7c62cfc2..56e8cd3e 100644 --- a/frameworks/js/napi/mdns/src/contexts/mdns_removelocalservice_context.cpp +++ b/frameworks/js/napi/mdns/src/contexts/mdns_removelocalservice_context.cpp @@ -22,7 +22,7 @@ namespace OHOS::NetManagerStandard { std::mutex g_mDNSUnregisterMutex; -MDnsRemoveLocalServiceContext::MDnsRemoveLocalServiceContext(napi_env env, EventManager *manager) +MDnsRemoveLocalServiceContext::MDnsRemoveLocalServiceContext(napi_env env, std::shared_ptr& manager) : MDnsBaseContext(env, manager) { } diff --git a/frameworks/js/napi/mdns/src/contexts/mdns_resolvelocalservice_context.cpp b/frameworks/js/napi/mdns/src/contexts/mdns_resolvelocalservice_context.cpp index 9d366ccb..a3580b1e 100644 --- a/frameworks/js/napi/mdns/src/contexts/mdns_resolvelocalservice_context.cpp +++ b/frameworks/js/napi/mdns/src/contexts/mdns_resolvelocalservice_context.cpp @@ -23,7 +23,7 @@ namespace OHOS::NetManagerStandard { std::map> MDnsResolveLocalServiceContext::resolveCallbackMap_; std::mutex g_mDNSResolveMutex; -MDnsResolveLocalServiceContext::MDnsResolveLocalServiceContext(napi_env env, EventManager *manager) +MDnsResolveLocalServiceContext::MDnsResolveLocalServiceContext(napi_env env, std::shared_ptr& manager) : MDnsBaseContext(env, manager), resolveObserver_(new (std::nothrow) MDnsResolveObserver()) { } diff --git a/frameworks/js/napi/mdns/src/contexts/mdns_startsearching_context.cpp b/frameworks/js/napi/mdns/src/contexts/mdns_startsearching_context.cpp index 12a82f5d..013de2f7 100644 --- a/frameworks/js/napi/mdns/src/contexts/mdns_startsearching_context.cpp +++ b/frameworks/js/napi/mdns/src/contexts/mdns_startsearching_context.cpp @@ -21,7 +21,8 @@ #include "mdns_common.h" namespace OHOS::NetManagerStandard { -MDnsStartSearchingContext::MDnsStartSearchingContext(napi_env env, EventManager *manager) : BaseContext(env, manager) +MDnsStartSearchingContext::MDnsStartSearchingContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) { if (manager) { auto discover = static_cast(manager->GetData()); diff --git a/frameworks/js/napi/mdns/src/mdns_instances.cpp b/frameworks/js/napi/mdns/src/mdns_instances.cpp index 242abc37..37786e41 100644 --- a/frameworks/js/napi/mdns/src/mdns_instances.cpp +++ b/frameworks/js/napi/mdns/src/mdns_instances.cpp @@ -23,14 +23,14 @@ namespace OHOS::NetManagerStandard { std::map MDnsDiscoveryInstance::discoverInstanceMap_; std::mutex g_mDNSDiscoverMutex; -MDnsDiscoveryInstance::MDnsDiscoveryInstance(EventManager *eventManager) +MDnsDiscoveryInstance::MDnsDiscoveryInstance(std::shared_ptr& eventManager) : observer_(new (std::nothrow) MDnsDiscoveryObserver), manager_(eventManager) { } MDnsDiscoveryInstance::MDnsDiscoveryInstance() {} -MDnsDiscoveryInstance *MDnsDiscoveryInstance::MakeMDnsDiscovery(EventManager *eventManager) +MDnsDiscoveryInstance *MDnsDiscoveryInstance::MakeMDnsDiscovery(std::shared_ptr& eventManager) { std::lock_guard lock(g_mDNSDiscoverMutex); auto mdnsDiscovery = new MDnsDiscoveryInstance(eventManager); @@ -59,7 +59,7 @@ sptr MDnsDiscoveryInstance::GetObserver() const return observer_; } -EventManager *MDnsDiscoveryInstance::GetEventManager() const +std::shared_ptr MDnsDiscoveryInstance::GetEventManager() const { return manager_; } diff --git a/frameworks/js/napi/mdns/src/mdns_module.cpp b/frameworks/js/napi/mdns/src/mdns_module.cpp index 68e7d9d8..f77553b1 100644 --- a/frameworks/js/napi/mdns/src/mdns_module.cpp +++ b/frameworks/js/napi/mdns/src/mdns_module.cpp @@ -47,7 +47,8 @@ static std::string GetContextIdString(napi_env env, napi_value obj) return std::string(); } -static void *ParseMDnsDiscoveryParams(napi_env env, size_t argc, napi_value *argv, EventManager *manager) +static void *ParseMDnsDiscoveryParams(napi_env env, size_t argc, napi_value *argv, + std::shared_ptr& manager) { std::unique_ptr mdnsDiscover( MDnsDiscoveryInstance::MakeMDnsDiscovery(manager), MDnsDiscoveryInstance::DeleteMDnsDiscovery); @@ -68,13 +69,17 @@ static void *ParseMDnsDiscoveryParams(napi_env env, size_t argc, napi_value *arg napi_value MDnsModule::CreateDiscoveryService(napi_env env, napi_callback_info info) { return ModuleTemplate::NewInstance(env, info, FUNCTION_DISCOVERY_SERVICE, ParseMDnsDiscoveryParams, - [](napi_env, void *data, void *) { - NETMANAGER_BASE_LOGI("finalize DiscoveryService"); - auto manager = static_cast(data); - auto mdnsDiscover = static_cast(manager->GetData()); - delete manager; - MDnsDiscoveryInstance::DeleteMDnsDiscovery(mdnsDiscover); - }); + [](napi_env, void *data, void *) { + NETMANAGER_BASE_LOGI("finalize DiscoveryService"); + auto sharedManager = static_cast *>(data); + if (sharedManager == nullptr || *sharedManager == nullptr) { + return; + } + auto manager = *sharedManager; + auto mdnsDiscover = static_cast(manager->GetData()); + delete sharedManager; + MDnsDiscoveryInstance::DeleteMDnsDiscovery(mdnsDiscover); + }); } napi_value MDnsModule::AddLocalService(napi_env env, napi_callback_info info) diff --git a/frameworks/js/napi/netfirewall/include/context/add_netfirewall_rule_context.h b/frameworks/js/napi/netfirewall/include/context/add_netfirewall_rule_context.h index 8292fd91..dc125438 100755 --- a/frameworks/js/napi/netfirewall/include/context/add_netfirewall_rule_context.h +++ b/frameworks/js/napi/netfirewall/include/context/add_netfirewall_rule_context.h @@ -29,7 +29,7 @@ class AddNetFirewallRuleContext : public BaseContext { public: AddNetFirewallRuleContext() = delete; - AddNetFirewallRuleContext(napi_env env, EventManager *manager); + AddNetFirewallRuleContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/delete_netfirewall_rule_context.h b/frameworks/js/napi/netfirewall/include/context/delete_netfirewall_rule_context.h index de413a59..c60313d4 100755 --- a/frameworks/js/napi/netfirewall/include/context/delete_netfirewall_rule_context.h +++ b/frameworks/js/napi/netfirewall/include/context/delete_netfirewall_rule_context.h @@ -28,7 +28,7 @@ class DeleteNetFirewallRuleContext : public BaseContext { public: DeleteNetFirewallRuleContext() = delete; - DeleteNetFirewallRuleContext(napi_env env, EventManager *manager); + DeleteNetFirewallRuleContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/get_all_intercept_records_context.h b/frameworks/js/napi/netfirewall/include/context/get_all_intercept_records_context.h index 8dc982c9..00a8d7e2 100755 --- a/frameworks/js/napi/netfirewall/include/context/get_all_intercept_records_context.h +++ b/frameworks/js/napi/netfirewall/include/context/get_all_intercept_records_context.h @@ -29,7 +29,7 @@ class GetInterceptRecordsContext : public BaseContext { public: GetInterceptRecordsContext() = delete; - GetInterceptRecordsContext(napi_env env, EventManager *manager); + GetInterceptRecordsContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/get_all_netfirewall_rules_context.h b/frameworks/js/napi/netfirewall/include/context/get_all_netfirewall_rules_context.h index ea709dd9..aabd43c5 100755 --- a/frameworks/js/napi/netfirewall/include/context/get_all_netfirewall_rules_context.h +++ b/frameworks/js/napi/netfirewall/include/context/get_all_netfirewall_rules_context.h @@ -29,7 +29,7 @@ class GetNetFirewallRulesContext : public BaseContext { public: GetNetFirewallRulesContext() = delete; - GetNetFirewallRulesContext(napi_env env, EventManager *manager); + GetNetFirewallRulesContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/get_netfirewall_policy_context.h b/frameworks/js/napi/netfirewall/include/context/get_netfirewall_policy_context.h index 881b9309..7019305f 100755 --- a/frameworks/js/napi/netfirewall/include/context/get_netfirewall_policy_context.h +++ b/frameworks/js/napi/netfirewall/include/context/get_netfirewall_policy_context.h @@ -29,7 +29,7 @@ class GetNetFirewallPolicyContext : public BaseContext { public: GetNetFirewallPolicyContext() = delete; - GetNetFirewallPolicyContext(napi_env env, EventManager *manager); + GetNetFirewallPolicyContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/get_netfirewall_rule_context.h b/frameworks/js/napi/netfirewall/include/context/get_netfirewall_rule_context.h index f8d1e600..d8323df3 100755 --- a/frameworks/js/napi/netfirewall/include/context/get_netfirewall_rule_context.h +++ b/frameworks/js/napi/netfirewall/include/context/get_netfirewall_rule_context.h @@ -29,7 +29,7 @@ class GetNetFirewallRuleContext : public BaseContext { public: GetNetFirewallRuleContext() = delete; - GetNetFirewallRuleContext(napi_env env, EventManager *manager); + GetNetFirewallRuleContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/set_netfirewall_policy_context.h b/frameworks/js/napi/netfirewall/include/context/set_netfirewall_policy_context.h index 78233a6e..4b03f8e2 100755 --- a/frameworks/js/napi/netfirewall/include/context/set_netfirewall_policy_context.h +++ b/frameworks/js/napi/netfirewall/include/context/set_netfirewall_policy_context.h @@ -31,7 +31,7 @@ class SetNetFirewallPolicyContext : public BaseContext { public: SetNetFirewallPolicyContext() = delete; - SetNetFirewallPolicyContext(napi_env env, EventManager *manager); + SetNetFirewallPolicyContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/include/context/update_netfirewall_rule_context.h b/frameworks/js/napi/netfirewall/include/context/update_netfirewall_rule_context.h index c67627f6..4ddb6dbe 100755 --- a/frameworks/js/napi/netfirewall/include/context/update_netfirewall_rule_context.h +++ b/frameworks/js/napi/netfirewall/include/context/update_netfirewall_rule_context.h @@ -29,7 +29,7 @@ class UpdateNetFirewallRuleContext : public BaseContext { public: UpdateNetFirewallRuleContext() = delete; - UpdateNetFirewallRuleContext(napi_env env, EventManager *manager); + UpdateNetFirewallRuleContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/netfirewall/src/context/add_netfirewall_rule_context.cpp b/frameworks/js/napi/netfirewall/src/context/add_netfirewall_rule_context.cpp index 88c0b92c..33b7a6cd 100755 --- a/frameworks/js/napi/netfirewall/src/context/add_netfirewall_rule_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/add_netfirewall_rule_context.cpp @@ -37,7 +37,8 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -AddNetFirewallRuleContext::AddNetFirewallRuleContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +AddNetFirewallRuleContext::AddNetFirewallRuleContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void AddNetFirewallRuleContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/netfirewall/src/context/delete_netfirewall_rule_context.cpp b/frameworks/js/napi/netfirewall/src/context/delete_netfirewall_rule_context.cpp index 5bd4eb2e..9dda5e91 100755 --- a/frameworks/js/napi/netfirewall/src/context/delete_netfirewall_rule_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/delete_netfirewall_rule_context.cpp @@ -36,7 +36,7 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -DeleteNetFirewallRuleContext::DeleteNetFirewallRuleContext(napi_env env, EventManager *manager) +DeleteNetFirewallRuleContext::DeleteNetFirewallRuleContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} diff --git a/frameworks/js/napi/netfirewall/src/context/get_all_intercept_records_context.cpp b/frameworks/js/napi/netfirewall/src/context/get_all_intercept_records_context.cpp index 727c5279..c3c92b65 100755 --- a/frameworks/js/napi/netfirewall/src/context/get_all_intercept_records_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/get_all_intercept_records_context.cpp @@ -36,7 +36,7 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -GetInterceptRecordsContext::GetInterceptRecordsContext(napi_env env, EventManager *manager) +GetInterceptRecordsContext::GetInterceptRecordsContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} diff --git a/frameworks/js/napi/netfirewall/src/context/get_all_netfirewall_rules_context.cpp b/frameworks/js/napi/netfirewall/src/context/get_all_netfirewall_rules_context.cpp index d24f7f50..cb33ecf2 100755 --- a/frameworks/js/napi/netfirewall/src/context/get_all_netfirewall_rules_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/get_all_netfirewall_rules_context.cpp @@ -36,7 +36,7 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return false; } -GetNetFirewallRulesContext::GetNetFirewallRulesContext(napi_env env, EventManager *manager) +GetNetFirewallRulesContext::GetNetFirewallRulesContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} diff --git a/frameworks/js/napi/netfirewall/src/context/get_netfirewall_policy_context.cpp b/frameworks/js/napi/netfirewall/src/context/get_netfirewall_policy_context.cpp index 5e63c23f..ab2734b5 100755 --- a/frameworks/js/napi/netfirewall/src/context/get_netfirewall_policy_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/get_netfirewall_policy_context.cpp @@ -34,7 +34,7 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t count) return true; } -GetNetFirewallPolicyContext::GetNetFirewallPolicyContext(napi_env env, EventManager *manager) +GetNetFirewallPolicyContext::GetNetFirewallPolicyContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} diff --git a/frameworks/js/napi/netfirewall/src/context/get_netfirewall_rule_context.cpp b/frameworks/js/napi/netfirewall/src/context/get_netfirewall_rule_context.cpp index 44325590..a2c37d7f 100755 --- a/frameworks/js/napi/netfirewall/src/context/get_netfirewall_rule_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/get_netfirewall_rule_context.cpp @@ -35,7 +35,8 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -GetNetFirewallRuleContext::GetNetFirewallRuleContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetNetFirewallRuleContext::GetNetFirewallRuleContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GetNetFirewallRuleContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/netfirewall/src/context/set_netfirewall_policy_context.cpp b/frameworks/js/napi/netfirewall/src/context/set_netfirewall_policy_context.cpp index 878a7339..66510760 100755 --- a/frameworks/js/napi/netfirewall/src/context/set_netfirewall_policy_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/set_netfirewall_policy_context.cpp @@ -38,7 +38,7 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t count) return true; } -SetNetFirewallPolicyContext::SetNetFirewallPolicyContext(napi_env env, EventManager *manager) +SetNetFirewallPolicyContext::SetNetFirewallPolicyContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} diff --git a/frameworks/js/napi/netfirewall/src/context/update_netfirewall_rule_context.cpp b/frameworks/js/napi/netfirewall/src/context/update_netfirewall_rule_context.cpp index 657b952c..f6d12c83 100755 --- a/frameworks/js/napi/netfirewall/src/context/update_netfirewall_rule_context.cpp +++ b/frameworks/js/napi/netfirewall/src/context/update_netfirewall_rule_context.cpp @@ -36,7 +36,7 @@ static bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount return true; } -UpdateNetFirewallRuleContext::UpdateNetFirewallRuleContext(napi_env env, EventManager *manager) +UpdateNetFirewallRuleContext::UpdateNetFirewallRuleContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} diff --git a/frameworks/js/napi/sharing/include/netshare_issharing_context.h b/frameworks/js/napi/sharing/include/netshare_issharing_context.h index afbb5849..8ce2188b 100644 --- a/frameworks/js/napi/sharing/include/netshare_issharing_context.h +++ b/frameworks/js/napi/sharing/include/netshare_issharing_context.h @@ -31,7 +31,7 @@ public: DISALLOW_COPY_AND_MOVE(NetShareIsSharingContext); NetShareIsSharingContext() = delete; - explicit NetShareIsSharingContext(napi_env env, EventManager *manager); + explicit NetShareIsSharingContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); void SetBytes32(int32_t bytes32); diff --git a/frameworks/js/napi/sharing/include/netshare_observer_wrapper.h b/frameworks/js/napi/sharing/include/netshare_observer_wrapper.h index c8205b76..ad2bdafe 100644 --- a/frameworks/js/napi/sharing/include/netshare_observer_wrapper.h +++ b/frameworks/js/napi/sharing/include/netshare_observer_wrapper.h @@ -36,11 +36,11 @@ public: bool asyncCallback); napi_value Off(napi_env env, napi_callback_info info, const std::initializer_list &events, bool asyncCallback); - EventManager *GetEventManager() const; + std::shared_ptr GetEventManager() const; private: sptr observer_ = nullptr; - EventManager *manager_ = nullptr; + std::shared_ptr manager_ = nullptr; bool registed_ = false; private: diff --git a/frameworks/js/napi/sharing/include/netshare_startsharing_context.h b/frameworks/js/napi/sharing/include/netshare_startsharing_context.h index d1663324..a0e7bab9 100644 --- a/frameworks/js/napi/sharing/include/netshare_startsharing_context.h +++ b/frameworks/js/napi/sharing/include/netshare_startsharing_context.h @@ -32,7 +32,7 @@ public: DISALLOW_COPY_AND_MOVE(NetShareStartSharingContext); NetShareStartSharingContext() = delete; - explicit NetShareStartSharingContext(napi_env env, EventManager *manager); + explicit NetShareStartSharingContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); int32_t GetParam() const; diff --git a/frameworks/js/napi/sharing/src/netshare_issharing_context.cpp b/frameworks/js/napi/sharing/src/netshare_issharing_context.cpp index aadb505d..3abcab47 100644 --- a/frameworks/js/napi/sharing/src/netshare_issharing_context.cpp +++ b/frameworks/js/napi/sharing/src/netshare_issharing_context.cpp @@ -21,7 +21,8 @@ namespace OHOS { namespace NetManagerStandard { -NetShareIsSharingContext::NetShareIsSharingContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +NetShareIsSharingContext::NetShareIsSharingContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void NetShareIsSharingContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/sharing/src/netshare_observer_wrapper.cpp b/frameworks/js/napi/sharing/src/netshare_observer_wrapper.cpp index e841325e..86eff9c4 100644 --- a/frameworks/js/napi/sharing/src/netshare_observer_wrapper.cpp +++ b/frameworks/js/napi/sharing/src/netshare_observer_wrapper.cpp @@ -27,16 +27,10 @@ namespace NetManagerStandard { NetShareObserverWrapper::NetShareObserverWrapper() { observer_ = new NetShareCallbackObserver(); - manager_ = new EventManager(); + manager_ = std::make_shared(); } -NetShareObserverWrapper::~NetShareObserverWrapper() -{ - if (manager_ != nullptr) { - delete manager_; - manager_ = nullptr; - } -} +NetShareObserverWrapper::~NetShareObserverWrapper() = default; napi_value NetShareObserverWrapper::On(napi_env env, napi_callback_info info, const std::initializer_list &events, bool asyncCallback) @@ -116,7 +110,7 @@ napi_value NetShareObserverWrapper::Off(napi_env env, napi_callback_info info, return NapiUtils::GetUndefined(env); } -EventManager *NetShareObserverWrapper::GetEventManager() const +std::shared_ptr NetShareObserverWrapper::GetEventManager() const { return manager_; } diff --git a/frameworks/js/napi/sharing/src/netshare_startsharing_context.cpp b/frameworks/js/napi/sharing/src/netshare_startsharing_context.cpp index 77551e1a..10c48b5a 100644 --- a/frameworks/js/napi/sharing/src/netshare_startsharing_context.cpp +++ b/frameworks/js/napi/sharing/src/netshare_startsharing_context.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace NetManagerStandard { -NetShareStartSharingContext::NetShareStartSharingContext(napi_env env, EventManager *manager) +NetShareStartSharingContext::NetShareStartSharingContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) { } diff --git a/frameworks/js/napi/vpn/include/context/add_context.h b/frameworks/js/napi/vpn/include/context/add_context.h index f8ef3287..af5286f7 100755 --- a/frameworks/js/napi/vpn/include/context/add_context.h +++ b/frameworks/js/napi/vpn/include/context/add_context.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class AddContext : public BaseContext { public: AddContext() = delete; - AddContext(napi_env env, EventManager *manager); + AddContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/context/delete_context.h b/frameworks/js/napi/vpn/include/context/delete_context.h index 2a9fe9cb..3298de88 100755 --- a/frameworks/js/napi/vpn/include/context/delete_context.h +++ b/frameworks/js/napi/vpn/include/context/delete_context.h @@ -27,7 +27,7 @@ namespace NetManagerStandard { class DeleteContext : public BaseContext { public: DeleteContext() = delete; - DeleteContext(napi_env env, EventManager *manager); + DeleteContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/context/destroy_context.h b/frameworks/js/napi/vpn/include/context/destroy_context.h index 0de064fb..c56e4a61 100644 --- a/frameworks/js/napi/vpn/include/context/destroy_context.h +++ b/frameworks/js/napi/vpn/include/context/destroy_context.h @@ -27,7 +27,7 @@ namespace NetManagerStandard { class DestroyContext : public BaseContext { public: DestroyContext() = delete; - DestroyContext(napi_env env, EventManager *manager); + DestroyContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); }; diff --git a/frameworks/js/napi/vpn/include/context/get_app_info_context.h b/frameworks/js/napi/vpn/include/context/get_app_info_context.h index f85d8f24..29ff01dd 100644 --- a/frameworks/js/napi/vpn/include/context/get_app_info_context.h +++ b/frameworks/js/napi/vpn/include/context/get_app_info_context.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class GetAppInfoContext : public BaseContext { public: GetAppInfoContext() = delete; - GetAppInfoContext(napi_env env, EventManager *manager); + GetAppInfoContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); public: diff --git a/frameworks/js/napi/vpn/include/context/get_connected_context.h b/frameworks/js/napi/vpn/include/context/get_connected_context.h index 402e8abe..15c621b1 100755 --- a/frameworks/js/napi/vpn/include/context/get_connected_context.h +++ b/frameworks/js/napi/vpn/include/context/get_connected_context.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class GetConnectedContext : public BaseContext { public: GetConnectedContext() = delete; - GetConnectedContext(napi_env env, EventManager *manager); + GetConnectedContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); public: diff --git a/frameworks/js/napi/vpn/include/context/get_context.h b/frameworks/js/napi/vpn/include/context/get_context.h index 83c618b6..4ed7918c 100755 --- a/frameworks/js/napi/vpn/include/context/get_context.h +++ b/frameworks/js/napi/vpn/include/context/get_context.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class GetContext : public BaseContext { public: GetContext() = delete; - GetContext(napi_env env, EventManager *manager); + GetContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/context/get_list_context.h b/frameworks/js/napi/vpn/include/context/get_list_context.h index 208e367f..b42ae852 100755 --- a/frameworks/js/napi/vpn/include/context/get_list_context.h +++ b/frameworks/js/napi/vpn/include/context/get_list_context.h @@ -29,7 +29,7 @@ namespace NetManagerStandard { class GetListContext : public BaseContext { public: GetListContext() = delete; - GetListContext(napi_env env, EventManager *manager); + GetListContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/context/prepare_context.h b/frameworks/js/napi/vpn/include/context/prepare_context.h index c43a9b0b..c86c3213 100644 --- a/frameworks/js/napi/vpn/include/context/prepare_context.h +++ b/frameworks/js/napi/vpn/include/context/prepare_context.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class PrepareContext : public BaseContext { public: PrepareContext() = delete; - PrepareContext(napi_env env, EventManager *manager); + PrepareContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/context/protect_context.h b/frameworks/js/napi/vpn/include/context/protect_context.h index 7c3ebd06..303efa63 100644 --- a/frameworks/js/napi/vpn/include/context/protect_context.h +++ b/frameworks/js/napi/vpn/include/context/protect_context.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class ProtectContext : public BaseContext { public: ProtectContext() = delete; - ProtectContext(napi_env env, EventManager *manager); + ProtectContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/context/setup_context.h b/frameworks/js/napi/vpn/include/context/setup_context.h index 95722334..77d2b7ae 100644 --- a/frameworks/js/napi/vpn/include/context/setup_context.h +++ b/frameworks/js/napi/vpn/include/context/setup_context.h @@ -32,7 +32,7 @@ namespace NetManagerStandard { class SetUpContext : public BaseContext { public: SetUpContext() = delete; - SetUpContext(napi_env env, EventManager *manager); + SetUpContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpn/include/vpn_monitor.h b/frameworks/js/napi/vpn/include/vpn_monitor.h index ae10b521..873f401f 100644 --- a/frameworks/js/napi/vpn/include/vpn_monitor.h +++ b/frameworks/js/napi/vpn/include/vpn_monitor.h @@ -45,7 +45,7 @@ public: napi_value On(napi_env env, napi_callback_info info); napi_value Off(napi_env env, napi_callback_info info); - EventManager inline *GetManager() const + inline std::shared_ptr GetManager() const { return manager_; } @@ -56,7 +56,7 @@ private: sptr multiEventCallback_ = nullptr; #endif // SUPPORT_SYSVPN napi_value callback_ = nullptr; - EventManager *manager_ = nullptr; + std::shared_ptr manager_ = nullptr; private: bool ParseParams(napi_env env, napi_callback_info info); diff --git a/frameworks/js/napi/vpn/src/context/add_context.cpp b/frameworks/js/napi/vpn/src/context/add_context.cpp index 34b9901d..9bae9b3d 100755 --- a/frameworks/js/napi/vpn/src/context/add_context.cpp +++ b/frameworks/js/napi/vpn/src/context/add_context.cpp @@ -27,7 +27,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_JUST_OPTIONS = 1; constexpr int32_t PARAM_OPTIONS_AND_CALLBACK = 2; -AddContext::AddContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +AddContext::AddContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} bool AddContext::CheckParamsType(napi_env env, napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/delete_context.cpp b/frameworks/js/napi/vpn/src/context/delete_context.cpp index 354bf23c..57d202c5 100755 --- a/frameworks/js/napi/vpn/src/context/delete_context.cpp +++ b/frameworks/js/napi/vpn/src/context/delete_context.cpp @@ -23,7 +23,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_JUST_OPTIONS = 1; constexpr int32_t PARAM_OPTIONS_AND_CALLBACK = 2; -DeleteContext::DeleteContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +DeleteContext::DeleteContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} namespace { bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount) diff --git a/frameworks/js/napi/vpn/src/context/destroy_context.cpp b/frameworks/js/napi/vpn/src/context/destroy_context.cpp index 7d91f5c2..24ccad98 100644 --- a/frameworks/js/napi/vpn/src/context/destroy_context.cpp +++ b/frameworks/js/napi/vpn/src/context/destroy_context.cpp @@ -21,7 +21,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -DestroyContext::DestroyContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +DestroyContext::DestroyContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void DestroyContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/get_app_info_context.cpp b/frameworks/js/napi/vpn/src/context/get_app_info_context.cpp index 336ba6d1..9a1e30f6 100644 --- a/frameworks/js/napi/vpn/src/context/get_app_info_context.cpp +++ b/frameworks/js/napi/vpn/src/context/get_app_info_context.cpp @@ -21,7 +21,8 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -GetAppInfoContext::GetAppInfoContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetAppInfoContext::GetAppInfoContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GetAppInfoContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/get_connected_context.cpp b/frameworks/js/napi/vpn/src/context/get_connected_context.cpp index b0411972..caca4f55 100755 --- a/frameworks/js/napi/vpn/src/context/get_connected_context.cpp +++ b/frameworks/js/napi/vpn/src/context/get_connected_context.cpp @@ -21,7 +21,8 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -GetConnectedContext::GetConnectedContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetConnectedContext::GetConnectedContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GetConnectedContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/get_context.cpp b/frameworks/js/napi/vpn/src/context/get_context.cpp index 50403a9b..505220c5 100755 --- a/frameworks/js/napi/vpn/src/context/get_context.cpp +++ b/frameworks/js/napi/vpn/src/context/get_context.cpp @@ -23,7 +23,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_JUST_OPTIONS = 1; constexpr int32_t PARAM_OPTIONS_AND_CALLBACK = 2; -GetContext::GetContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetContext::GetContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} bool GetContext::CheckParamsType(napi_env env, napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/get_list_context.cpp b/frameworks/js/napi/vpn/src/context/get_list_context.cpp index d1904563..39e50633 100755 --- a/frameworks/js/napi/vpn/src/context/get_list_context.cpp +++ b/frameworks/js/napi/vpn/src/context/get_list_context.cpp @@ -21,7 +21,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -GetListContext::GetListContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GetListContext::GetListContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void GetListContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/prepare_context.cpp b/frameworks/js/napi/vpn/src/context/prepare_context.cpp index 43e5938e..4e4033b3 100644 --- a/frameworks/js/napi/vpn/src/context/prepare_context.cpp +++ b/frameworks/js/napi/vpn/src/context/prepare_context.cpp @@ -24,7 +24,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -PrepareContext::PrepareContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +PrepareContext::PrepareContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void PrepareContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/context/protect_context.cpp b/frameworks/js/napi/vpn/src/context/protect_context.cpp index 30e0b303..cf1581c9 100644 --- a/frameworks/js/napi/vpn/src/context/protect_context.cpp +++ b/frameworks/js/napi/vpn/src/context/protect_context.cpp @@ -24,7 +24,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_JUST_OPTIONS = 1; constexpr int32_t PARAM_OPTIONS_AND_CALLBACK = 2; -ProtectContext::ProtectContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +ProtectContext::ProtectContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} namespace { bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount) diff --git a/frameworks/js/napi/vpn/src/context/setup_context.cpp b/frameworks/js/napi/vpn/src/context/setup_context.cpp index 891b05fe..518ba341 100644 --- a/frameworks/js/napi/vpn/src/context/setup_context.cpp +++ b/frameworks/js/napi/vpn/src/context/setup_context.cpp @@ -120,7 +120,7 @@ void GetBoolFromJsOptionItem(napi_env env, napi_value object, const std::string } } // namespace -SetUpContext::SetUpContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +SetUpContext::SetUpContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void SetUpContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpn/src/vpn_module.cpp b/frameworks/js/napi/vpn/src/vpn_module.cpp index f9e44f9e..35f61f1b 100644 --- a/frameworks/js/napi/vpn/src/vpn_module.cpp +++ b/frameworks/js/napi/vpn/src/vpn_module.cpp @@ -48,7 +48,7 @@ constexpr const char *GET_SYS_VPN_CONFIG = "getSysVpnConfig"; constexpr const char *GET_CONNECTED_SYS_VPN_CONFIG = "getConnectedSysVpnConfig"; #endif // SUPPORT_SYSVPN -static void *MakeData(napi_env env, size_t argc, napi_value *argv, EventManager *manager) +static void *MakeData(napi_env env, size_t argc, napi_value *argv, std::shared_ptr& manager) { if ((argc != PARAM_ONE) || (NapiUtils::GetValueType(env, argv[ARG_NUM_0]) != napi_object)) { NETMANAGER_EXT_LOGE("funciton prameter error"); diff --git a/frameworks/js/napi/vpn/src/vpn_monitor.cpp b/frameworks/js/napi/vpn/src/vpn_monitor.cpp index 8bb35899..388908a5 100644 --- a/frameworks/js/napi/vpn/src/vpn_monitor.cpp +++ b/frameworks/js/napi/vpn/src/vpn_monitor.cpp @@ -152,16 +152,10 @@ int32_t VpnEventCallback::OnMultiVpnStateChanged(bool isConnected, const std::st VpnMonitor::VpnMonitor() { - manager_ = new EventManager(); + manager_ = std::make_shared(); } -VpnMonitor::~VpnMonitor() -{ - if (manager_ != nullptr) { - delete manager_; - manager_ = nullptr; - } -} +VpnMonitor::~VpnMonitor() = default; VpnMonitor &VpnMonitor::GetInstance() { diff --git a/frameworks/js/napi/vpnext/include/context/destroy_context_ext.h b/frameworks/js/napi/vpnext/include/context/destroy_context_ext.h index d3f49632..cc5c9a40 100644 --- a/frameworks/js/napi/vpnext/include/context/destroy_context_ext.h +++ b/frameworks/js/napi/vpnext/include/context/destroy_context_ext.h @@ -27,7 +27,7 @@ namespace NetManagerStandard { class DestroyContext : public BaseContext { public: DestroyContext() = delete; - DestroyContext(napi_env env, EventManager *manager); + DestroyContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpnext/include/context/generate_vpnId_context_ext.h b/frameworks/js/napi/vpnext/include/context/generate_vpnId_context_ext.h index dbb90226..572b1ccb 100644 --- a/frameworks/js/napi/vpnext/include/context/generate_vpnId_context_ext.h +++ b/frameworks/js/napi/vpnext/include/context/generate_vpnId_context_ext.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class GenerateVpnIdContext : public BaseContext { public: GenerateVpnIdContext() = delete; - GenerateVpnIdContext(napi_env env, EventManager *manager); + GenerateVpnIdContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpnext/include/context/prepare_context_ext.h b/frameworks/js/napi/vpnext/include/context/prepare_context_ext.h index c43a9b0b..c86c3213 100644 --- a/frameworks/js/napi/vpnext/include/context/prepare_context_ext.h +++ b/frameworks/js/napi/vpnext/include/context/prepare_context_ext.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class PrepareContext : public BaseContext { public: PrepareContext() = delete; - PrepareContext(napi_env env, EventManager *manager); + PrepareContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpnext/include/context/protect_context_ext.h b/frameworks/js/napi/vpnext/include/context/protect_context_ext.h index 7c3ebd06..303efa63 100644 --- a/frameworks/js/napi/vpnext/include/context/protect_context_ext.h +++ b/frameworks/js/napi/vpnext/include/context/protect_context_ext.h @@ -28,7 +28,7 @@ namespace NetManagerStandard { class ProtectContext : public BaseContext { public: ProtectContext() = delete; - ProtectContext(napi_env env, EventManager *manager); + ProtectContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpnext/include/context/setup_context_ext.h b/frameworks/js/napi/vpnext/include/context/setup_context_ext.h index 95722334..77d2b7ae 100644 --- a/frameworks/js/napi/vpnext/include/context/setup_context_ext.h +++ b/frameworks/js/napi/vpnext/include/context/setup_context_ext.h @@ -32,7 +32,7 @@ namespace NetManagerStandard { class SetUpContext : public BaseContext { public: SetUpContext() = delete; - SetUpContext(napi_env env, EventManager *manager); + SetUpContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpnext/include/context/vpn_context_ext.h b/frameworks/js/napi/vpnext/include/context/vpn_context_ext.h index 650b850d..ccf68d02 100644 --- a/frameworks/js/napi/vpnext/include/context/vpn_context_ext.h +++ b/frameworks/js/napi/vpnext/include/context/vpn_context_ext.h @@ -29,7 +29,7 @@ namespace NetManagerStandard { class VpnContext : public BaseContext { public: VpnContext() = delete; - VpnContext(napi_env env, EventManager *manager); + VpnContext(napi_env env, std::shared_ptr& manager); void ParseParams(napi_value *params, size_t paramsCount); diff --git a/frameworks/js/napi/vpnext/include/vpn_monitor_ext.h b/frameworks/js/napi/vpnext/include/vpn_monitor_ext.h index f7c0be72..39ae83ce 100644 --- a/frameworks/js/napi/vpnext/include/vpn_monitor_ext.h +++ b/frameworks/js/napi/vpnext/include/vpn_monitor_ext.h @@ -55,7 +55,7 @@ public: napi_value Off(napi_env env, napi_callback_info info); bool ShowVpnDialog(const std::string &bundleName, const std::string &abilityName, const std::string &appName); - EventManager inline *GetManager() const + inline std::shared_ptr GetManager() const { return manager_; } @@ -63,7 +63,7 @@ public: private: sptr eventCallback_ = nullptr; napi_value callback_ = nullptr; - EventManager *manager_ = nullptr; + std::shared_ptr manager_ = nullptr; class VpnAbilityConn : public AAFwk::AbilityConnectionStub { void OnAbilityConnectDone(const AppExecFwk::ElementName &element, const sptr &remoteObject, diff --git a/frameworks/js/napi/vpnext/src/context/destroy_context_ext.cpp b/frameworks/js/napi/vpnext/src/context/destroy_context_ext.cpp index 2111825a..e6a4cd97 100644 --- a/frameworks/js/napi/vpnext/src/context/destroy_context_ext.cpp +++ b/frameworks/js/napi/vpnext/src/context/destroy_context_ext.cpp @@ -22,7 +22,7 @@ constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; constexpr int32_t PARAM_OPTIONS_AND_CALLBACK = 2; -DestroyContext::DestroyContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +DestroyContext::DestroyContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void DestroyContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpnext/src/context/generate_vpnId_context_ext.cpp b/frameworks/js/napi/vpnext/src/context/generate_vpnId_context_ext.cpp index fd729c41..66fa1579 100644 --- a/frameworks/js/napi/vpnext/src/context/generate_vpnId_context_ext.cpp +++ b/frameworks/js/napi/vpnext/src/context/generate_vpnId_context_ext.cpp @@ -24,7 +24,8 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -GenerateVpnIdContext::GenerateVpnIdContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +GenerateVpnIdContext::GenerateVpnIdContext(napi_env env, std::shared_ptr& manager) + : BaseContext(env, manager) {} void GenerateVpnIdContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpnext/src/context/prepare_context_ext.cpp b/frameworks/js/napi/vpnext/src/context/prepare_context_ext.cpp index ae19b371..38b6527b 100644 --- a/frameworks/js/napi/vpnext/src/context/prepare_context_ext.cpp +++ b/frameworks/js/napi/vpnext/src/context/prepare_context_ext.cpp @@ -24,7 +24,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_NONE = 0; constexpr int32_t PARAM_JUST_CALLBACK = 1; -PrepareContext::PrepareContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +PrepareContext::PrepareContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void PrepareContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpnext/src/context/protect_context_ext.cpp b/frameworks/js/napi/vpnext/src/context/protect_context_ext.cpp index 062d5190..6fda0024 100644 --- a/frameworks/js/napi/vpnext/src/context/protect_context_ext.cpp +++ b/frameworks/js/napi/vpnext/src/context/protect_context_ext.cpp @@ -24,7 +24,7 @@ namespace NetManagerStandard { constexpr int32_t PARAM_JUST_OPTIONS = 1; constexpr int32_t PARAM_OPTIONS_AND_CALLBACK = 2; -ProtectContext::ProtectContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +ProtectContext::ProtectContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} namespace { bool CheckParamsType(napi_env env, napi_value *params, size_t paramsCount) diff --git a/frameworks/js/napi/vpnext/src/context/setup_context_ext.cpp b/frameworks/js/napi/vpnext/src/context/setup_context_ext.cpp index febbc12a..6aa27c8a 100644 --- a/frameworks/js/napi/vpnext/src/context/setup_context_ext.cpp +++ b/frameworks/js/napi/vpnext/src/context/setup_context_ext.cpp @@ -116,7 +116,7 @@ void GetBoolFromJsOptionItem(napi_env env, napi_value object, const std::string } } // namespace -SetUpContext::SetUpContext(napi_env env, EventManager *manager) : BaseContext(env, manager) {} +SetUpContext::SetUpContext(napi_env env, std::shared_ptr& manager) : BaseContext(env, manager) {} void SetUpContext::ParseParams(napi_value *params, size_t paramsCount) { diff --git a/frameworks/js/napi/vpnext/src/vpn_module_ext.cpp b/frameworks/js/napi/vpnext/src/vpn_module_ext.cpp index 9a494372..de74e729 100644 --- a/frameworks/js/napi/vpnext/src/vpn_module_ext.cpp +++ b/frameworks/js/napi/vpnext/src/vpn_module_ext.cpp @@ -117,7 +117,7 @@ static napi_value CreateObserveDataSharePromise(napi_env env, const std::string return promise; } -static void *MakeDataExt(napi_env env, size_t argc, napi_value *argv, EventManager *manager) +static void *MakeDataExt(napi_env env, size_t argc, napi_value *argv, std::shared_ptr& manager) { if ((argc != PARAM_ONE) || (NapiUtils::GetValueType(env, argv[ARG_NUM_0]) != napi_object)) { NETMANAGER_EXT_LOGE("funciton prameter error"); -- Gitee