From b652916b119487d8a41f1f4540b6e195ab00ddb3 Mon Sep 17 00:00:00 2001 From: rong_zhichao Date: Wed, 3 Sep 2025 11:33:21 +0800 Subject: [PATCH 1/3] modify err code Signed-off-by: rong_zhichao --- frameworks/js/napi/vpn/src/context/get_app_info_context.cpp | 2 +- frameworks/js/napi/vpn/src/networkvpn_service.cpp | 4 ++-- .../napi/vpnext/src/context/generate_vpnId_context_ext.cpp | 2 +- frameworks/native/netvpnclient/src/networkvpn_client.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) 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 9a1e30f6..4e6216cd 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 @@ -34,7 +34,7 @@ void GetAppInfoContext::ParseParams(napi_value *params, size_t paramsCount) SetParseOK(SetCallback(params[0]) == napi_ok); break; default: - SetErrorCode(NETMANAGER_EXT_ERR_PARAMETER_ERROR); + SetErrorCode(NETMANAGER_ERR_PARAMETER_INVALID); SetNeedThrowException(true); break; } diff --git a/frameworks/js/napi/vpn/src/networkvpn_service.cpp b/frameworks/js/napi/vpn/src/networkvpn_service.cpp index 2690ee5b..5fd5a2b2 100644 --- a/frameworks/js/napi/vpn/src/networkvpn_service.cpp +++ b/frameworks/js/napi/vpn/src/networkvpn_service.cpp @@ -853,7 +853,7 @@ int32_t NetworkVpnService::DestroyVpn(const std::string &vpnId) { if (vpnId.empty()) { NETMGR_EXT_LOG_E("vpnId is empty"); - return NETMANAGER_EXT_ERR_PARAMETER_ERROR; + return NETMANAGER_ERR_PARAMETER_INVALID; } std::unique_lock locker(netVpnMutex_); std::string vpnBundleName = GetBundleName(); @@ -1182,7 +1182,7 @@ int32_t NetworkVpnService::GetConnectedVpnAppInfo(std::vector &bund if (vpnObj == nullptr || vpnObj->multiVpnInfo_ == nullptr) { NETMGR_EXT_LOG_E("GetConnectedVpnAppInfo failed, vpnObj invalid"); it = vpnObjMap_.erase(it); - return NETMANAGER_EXT_ERR_INTERNAL; + return NETMANAGER_ERR_SYSTEM_INTERNAL; } if (userId == vpnObj->multiVpnInfo_->userId) { std::string name = vpnObj->multiVpnInfo_->bundleName; 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 66fa1579..c6479a6c 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 @@ -37,7 +37,7 @@ void GenerateVpnIdContext::ParseParams(napi_value *params, size_t paramsCount) SetParseOK(SetCallback(params[0]) == napi_ok); break; default: - SetErrorCode(NETMANAGER_EXT_ERR_PARAMETER_ERROR); + SetErrorCode(NETMANAGER_ERR_PARAMETER_INVALIDdestroy); SetNeedThrowException(true); break; } diff --git a/frameworks/native/netvpnclient/src/networkvpn_client.cpp b/frameworks/native/netvpnclient/src/networkvpn_client.cpp index e141a290..b5512c07 100644 --- a/frameworks/native/netvpnclient/src/networkvpn_client.cpp +++ b/frameworks/native/netvpnclient/src/networkvpn_client.cpp @@ -285,7 +285,7 @@ int32_t NetworkVpnClient::DestroyVpn(const std::string &vpnId) { if (vpnId.empty()) { NETMGR_EXT_LOG_E("DestroyVpn vpnId is empty"); - return NETMANAGER_EXT_ERR_PARAMETER_ERROR; + return NETMANAGER_ERR_PARAMETER_INVALID; } vpnInterface_.CloseVpnInterfaceFd(); if (vpnEventCallback_ != nullptr) { @@ -296,7 +296,7 @@ int32_t NetworkVpnClient::DestroyVpn(const std::string &vpnId) sptr proxy = GetProxy(); if (proxy == nullptr) { NETMGR_EXT_LOG_E("DestroyVpn proxy is nullptr"); - return NETMANAGER_EXT_ERR_GET_PROXY_FAIL; + return NETMANAGER_ERR_SYSTEM_INTERNAL; } return proxy->DestroyVpn(vpnId); } @@ -349,7 +349,7 @@ int32_t NetworkVpnClient::GetConnectedVpnAppInfo(std::vector &bundl sptr proxy = GetProxy(); if (proxy == nullptr) { NETMGR_EXT_LOG_E("GetConnectedVpnAppInfo proxy is nullptr"); - return NETMANAGER_EXT_ERR_GET_PROXY_FAIL; + return NETMANAGER_ERR_SYSTEM_INTERNAL; } return proxy->GetConnectedVpnAppInfo(bundleNameList); } -- Gitee From 8a22b079ba0e9acc719df61b730fe7de3acf9da5 Mon Sep 17 00:00:00 2001 From: rong_zhichao Date: Wed, 3 Sep 2025 15:40:53 +0800 Subject: [PATCH 2/3] modify err code Signed-off-by: rong_zhichao --- frameworks/js/napi/vpn/src/networkvpn_service.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frameworks/js/napi/vpn/src/networkvpn_service.cpp b/frameworks/js/napi/vpn/src/networkvpn_service.cpp index 5fd5a2b2..53f44a1a 100644 --- a/frameworks/js/napi/vpn/src/networkvpn_service.cpp +++ b/frameworks/js/napi/vpn/src/networkvpn_service.cpp @@ -1331,7 +1331,7 @@ int32_t NetworkVpnService::RegisterMultiVpnEvent(const sptr & if (!CheckVpnPermission(vpnBundleName)) { return NETMANAGER_EXT_ERR_PERMISSION_DENIED; } - int32_t ret = NETMANAGER_EXT_ERR_OPERATION_FAILED; + int32_t ret = NETMANAGER_ERR_SYSTEM_INTERNAL; if (!networkVpnServiceFfrtQueue_) { NETMGR_EXT_LOG_E("FFRT Create Fail"); return ret; @@ -1350,7 +1350,7 @@ int32_t NetworkVpnService::UnregisterMultiVpnEvent(const sptr if (!CheckVpnPermission(vpnBundleName)) { return NETMANAGER_EXT_ERR_PERMISSION_DENIED; } - int32_t ret = NETMANAGER_EXT_ERR_OPERATION_FAILED; + int32_t ret = NETMANAGER_ERR_SYSTEM_INTERNAL; if (!networkVpnServiceFfrtQueue_) { NETMGR_EXT_LOG_E("FFRT Create Fail"); return ret; @@ -1469,21 +1469,21 @@ int32_t NetworkVpnService::SyncRegisterMultiVpnEvent(const sptr autoLock(remoteMutex_); for (auto iterCb = multiVpnEventCallbacks_.begin(); iterCb != multiVpnEventCallbacks_.end(); iterCb++) { if (((*iterCb)->callback)->AsObject().GetRefPtr() == callback->AsObject().GetRefPtr()) { NETMGR_EXT_LOG_E("Register multi vpn event callback failed, callback already exists"); - return NETMANAGER_EXT_ERR_OPERATION_FAILED; + return NETMANAGER_ERR_SYSTEM_INTERNAL; } } if (multiVpnEventCallbacks_.size() >= MAX_CALLBACK_COUNT) { NETMGR_EXT_LOG_E("callback above max count, return error."); - return NETMANAGER_EXT_ERR_PARAMETER_ERROR; + return NETMANAGER_ERR_PARAMETER_INVALID; } if (!AddClientDeathRecipient(callback)) { - return NETMANAGER_EXT_ERR_OPERATION_FAILED; + return NETMANAGER_ERR_SYSTEM_INTERNAL; } int32_t userId = AppExecFwk::Constants::UNSPECIFIED_USERID; if (AccountSA::OsAccountManager::GetForegroundOsAccountLocalId(userId) != ERR_OK) { @@ -1515,7 +1515,7 @@ int32_t NetworkVpnService::SyncUnregisterMultiVpnEvent(const sptr Date: Wed, 3 Sep 2025 15:43:29 +0800 Subject: [PATCH 3/3] modify err code Signed-off-by: rong_zhichao --- .../js/napi/vpnext/src/context/generate_vpnId_context_ext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c6479a6c..7c436929 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 @@ -37,7 +37,7 @@ void GenerateVpnIdContext::ParseParams(napi_value *params, size_t paramsCount) SetParseOK(SetCallback(params[0]) == napi_ok); break; default: - SetErrorCode(NETMANAGER_ERR_PARAMETER_INVALIDdestroy); + SetErrorCode(NETMANAGER_ERR_PARAMETER_INVALID); SetNeedThrowException(true); break; } -- Gitee