From 205403abb9125e9ce57a05de657618127599dcc2 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 24 Jul 2022 23:05:19 +0800 Subject: [PATCH 1/7] bugfix for untrusted configs 0724 Signed-off-by: yanxiaotao --- .../js/napi/src/wifi_napi_device.cpp | 19 +----- .../native/src/wifi_device_impl.cpp | 6 ++ wifi/frameworks/native/src/wifi_device_impl.h | 8 +++ .../native/src/wifi_device_proxy.cpp | 35 +++++++++++ .../frameworks/native/src/wifi_device_proxy.h | 8 +++ .../wifi_manage/wifi_device_service_impl.cpp | 60 ++++++++++++++++--- .../wifi_manage/wifi_device_service_impl.h | 4 ++ .../wifi_manage/wifi_device_stub.cpp | 16 ++++- 8 files changed, 128 insertions(+), 28 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index 83d782ad9..ae9db9044 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -401,7 +401,7 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); TRACE_FUNC_CALL_NAME("wifiDevicePtr->AddUntrustedConfig"); - ErrCode ret = wifiDevicePtr->AddDeviceConfig(*context->config, context->networkId); + ErrCode ret = wifiDevicePtr->AddCandidateConfig(*context->config, context->networkId); if (context->networkId < 0 || ret != WIFI_OPT_SUCCESS) { context->networkId = -1; } @@ -466,21 +466,8 @@ napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) asyncContext->executeFunc = [&](void* data) -> void { DeviceConfigContext *context = static_cast(data); - if (context->config == nullptr) { - return; - } - TRACE_FUNC_CALL_NAME("wifiDevicePtr->RemoveUntrustedConfig"); - int networkId = context->config->networkId; - if (networkId < 0) { - networkId = GetDeviceConfigId(context->config); - } - if (networkId < 0) { - WIFI_LOGE("RemoveUntrustedConfig parameter is invalid."); - context->errorCode = WIFI_OPT_INVALID_PARAM; - return; - } - WIFI_LOGI("RemoveUntrustedConfig: %{public}d", networkId); - context->errorCode = wifiDevicePtr->RemoveDevice(networkId); + TRACE_FUNC_CALL_NAME("wifiDevicePtr->RemoveCandidateConfig"); + context->errorCode = wifiDevicePtr->RemoveCandidateConfig(*context->config); }; asyncContext->completeFunc = [&](void* data) -> void { diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index 29b80ef15..bb6c13450 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -109,6 +109,12 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) return client_->PutWifiProtectRef(protectName); } +ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + RETURN_IF_FAIL(client_); + return client_->RemoveUntrustedConfig(config); +} + ErrCode WifiDeviceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) { RETURN_IF_FAIL(client_); diff --git a/wifi/frameworks/native/src/wifi_device_impl.h b/wifi/frameworks/native/src/wifi_device_impl.h index 781a09618..dd532023f 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.h +++ b/wifi/frameworks/native/src/wifi_device_impl.h @@ -84,6 +84,14 @@ public: */ virtual ErrCode RemoveCandidateConfig(int networkId) override; + /** + * @Description Remove a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; + /** * @Description Connect to a candidate specified network. * diff --git a/wifi/frameworks/native/src/wifi_device_proxy.cpp b/wifi/frameworks/native/src/wifi_device_proxy.cpp index 3841bae5a..78c5d7ab8 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.cpp +++ b/wifi/frameworks/native/src/wifi_device_proxy.cpp @@ -277,6 +277,39 @@ ErrCode WifiDeviceProxy::AddCandidateConfig(const WifiDeviceConfig &config, int return WIFI_OPT_SUCCESS; } +ErrCode WifiDeviceProxy::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + if (mRemoteDied) { + WIFI_LOGE("failed to `%{public}s`,remote service is died!", __func__); + return WIFI_OPT_FAILED; + } + MessageOption option; + MessageParcel data, reply; + if (!data.WriteInterfaceToken(GetDescriptor())) { + WIFI_LOGE("Write interface token error: %{public}s", __func__); + return WIFI_OPT_FAILED; + } + data.WriteInt32(0); + /* Write a flag: 1-remove config by networkId, 2-remove config by WifiDeviceConfig */ + data.WriteInt32(2); + WriteDeviceConfig(config, data); + int error = Remote()->SendRequest(WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, data, reply, option); + if (error != ERR_NONE) { + WIFI_LOGE("Set Attr(%{public}d) failed,error=%{public}d", WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, error); + return WIFI_OPT_FAILED; + } + int exception = reply.ReadInt32(); + if (exception) { + return WIFI_OPT_FAILED; + } + int ret = reply.ReadInt32(); + if (ret != WIFI_OPT_SUCCESS) { + return ErrCode(ret); + } + + return WIFI_OPT_SUCCESS; +} + ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) { if (mRemoteDied) { @@ -290,6 +323,8 @@ ErrCode WifiDeviceProxy::RemoveCandidateConfig(int networkId) return WIFI_OPT_FAILED; } data.WriteInt32(0); + /* Write a flag: 1-remove config by networkId, 2-remove config by WifiDeviceConfig */ + data.WriteInt32(1); data.WriteInt32(networkId); int error = Remote()->SendRequest(WIFI_SVR_CMD_REMOVE_CANDIDATE_CONFIG, data, reply, option); if (error != ERR_NONE) { diff --git a/wifi/frameworks/native/src/wifi_device_proxy.h b/wifi/frameworks/native/src/wifi_device_proxy.h index d0f8dde88..98dc27ce8 100644 --- a/wifi/frameworks/native/src/wifi_device_proxy.h +++ b/wifi/frameworks/native/src/wifi_device_proxy.h @@ -81,6 +81,14 @@ public: */ ErrCode PutWifiProtectRef(const std::string &protectName) override; + /** + * @Description Remove a specified untrusted hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @return ErrCode - operation result + */ + ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; + /** * @Description Adds a specified untrusted hotspot configuration. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7d810de23..1c999edca 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -455,34 +455,76 @@ ErrCode WifiDeviceServiceImpl::ConnectToCandidateConfig(int networkId) return pService->ConnectToCandidateConfig(uid, networkId); } -ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) +ErrCode WifiDeviceServiceImpl::CheckRemoveCandidateConfig(void) { if (WifiPermissionUtils::VerifySetWifiInfoPermission() == PERMISSION_DENIED) { - WIFI_LOGE("RemoveCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); + WIFI_LOGE("CheckRemoveCandidateConfig:VerifySetWifiInfoPermission PERMISSION_DENIED!"); return WIFI_OPT_PERMISSION_DENIED; } - if (networkId < INVALID_NETWORK_ID) { - WIFI_LOGE("RemoveCandidateConfig networkId invalid param!"); - return WIFI_OPT_INVALID_PARAM; - } - if (!IsStaServiceRunning()) { - WIFI_LOGE("RemoveCandidateConfig:IsStaServiceRunning not running!"); + WIFI_LOGE("CheckRemoveCandidateConfig:IsStaServiceRunning not running!"); return WIFI_OPT_STA_NOT_OPENED; } + return WIFI_SUCCESS; +} + +ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + ErrCode ret = CheckRemoveCandidateConfig(); + if (ret != WIFI_SUCCESS) { + return ret; + } + /* check the caller's uid */ int uid = 0; if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { WIFI_LOGE("CheckCallingUid failed!"); return WIFI_OPT_INVALID_PARAM; } - IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); if (pService == nullptr) { + WIFI_LOGE("pService is nullptr!"); return WIFI_OPT_STA_NOT_OPENED; } + /* get all candidate configs */ + std::vector configs; + if (WifiConfigCenter::GetInstance().GetCandidateConfigs(uid, configs) != 0) { + WIFI_LOGE("NOT find the caller's configs!"); + return WIFI_OPT_INVALID_CONFIG; + } + /* find the networkId of the removed config */ + int networkId == INVALID_NETWORK_ID + for (size_t i = 0; i < configs.size(); i++) { + if (configs[i].ssid == config.ssid) { + networkId = configs[i].networkId; + WIFI_LOGI("find the removed config, networkId:%{public}d!"); + break; + } + } + /* removed the config */ + if (networkId != INVALID_NETWORK_ID) { + return pService->RemoveCandidateConfig(uid, networkId); + } + return WIFI_OPT_INVALID_CONFIG; +} +ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) +{ + ErrCode ret = CheckRemoveCandidateConfig(); + if (ret != WIFI_SUCCESS) { + return ret; + } + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + WIFI_LOGE("CheckCallingUid failed!"); + return WIFI_OPT_INVALID_PARAM; + } + IStaService *pService = WifiServiceManager::GetInstance().GetStaServiceInst(); + if (pService == nullptr) { + WIFI_LOGE("pService is nullptr!"); + return WIFI_OPT_STA_NOT_OPENED; + } if (networkId == INVALID_NETWORK_ID) { return pService->RemoveAllCandidateConfig(uid); } else { diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index db8fa4737..99b45a74b 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -141,8 +141,12 @@ public: ErrCode ConnectToCandidateConfig(int networkId) override; + ErrCode CheckRemoveCandidateConfig(void) override; + ErrCode RemoveCandidateConfig(int networkId) override; + ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; + ErrCode GetCandidateConfigs(std::vector &result) override; #ifndef OHOS_ARCH_LITE diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp index 18eee3b77..a2e0e7da7 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_stub.cpp @@ -673,9 +673,19 @@ void WifiDeviceStub::OnConnectToCandidateConfig(uint32_t code, MessageParcel &da void WifiDeviceStub::OnRemoveCandidateConfig(uint32_t code, MessageParcel &data, MessageParcel &reply) { WIFI_LOGD("run %{public}s code %{public}u, datasize %{public}zu", __func__, code, data.GetRawDataSize()); - int networkId = data.ReadInt32(); - ErrCode ret = RemoveCandidateConfig(networkId); - + ErrCode ret = WIFI_OPT_FAILED; + int flag = data.ReadInt32(); + /* Read a flag: 1-remove config by networkId, 2-remove config by WifiDeviceConfig */ + if (flag == 1) { + int networkId = data.ReadInt32(); + WIFI_LOGI("Remove candidate config by networkId: %{public}d", networkId); + ret = RemoveCandidateConfig(networkId); + } else { + WifiDeviceConfig config; + ReadWifiDeviceConfig(data, config); + WIFI_LOGD("Remove candidate config by config: %{private}s", config.ssid.c_str()); + ret = RemoveCandidateConfig(config); + } reply.WriteInt32(0); reply.WriteInt32(ret); return; -- Gitee From 4844fea657a840906e373ee72d86991b6aef0fde Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Sun, 24 Jul 2022 23:31:47 +0800 Subject: [PATCH 2/7] bugfix for untrusted configs 0724 Signed-off-by: yanxiaotao --- .../wifi_manage/wifi_device_service_impl.cpp | 11 ++++++----- .../wifi_manage/wifi_device_service_impl.h | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 1c999edca..7a4c0d6f9 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -467,13 +467,13 @@ ErrCode WifiDeviceServiceImpl::CheckRemoveCandidateConfig(void) return WIFI_OPT_STA_NOT_OPENED; } - return WIFI_SUCCESS; + return WIFI_OPT_SUCCESS; } ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) { ErrCode ret = CheckRemoveCandidateConfig(); - if (ret != WIFI_SUCCESS) { + if (ret != WIFI_OPT_SUCCESS) { return ret; } /* check the caller's uid */ @@ -494,8 +494,9 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con return WIFI_OPT_INVALID_CONFIG; } /* find the networkId of the removed config */ - int networkId == INVALID_NETWORK_ID - for (size_t i = 0; i < configs.size(); i++) { + int networkId = INVALID_NETWORK_ID; + size_t size = configs.size() + for (size_t i = 0; i < size; i++) { if (configs[i].ssid == config.ssid) { networkId = configs[i].networkId; WIFI_LOGI("find the removed config, networkId:%{public}d!"); @@ -512,7 +513,7 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(int networkId) { ErrCode ret = CheckRemoveCandidateConfig(); - if (ret != WIFI_SUCCESS) { + if (ret != WIFI_OPT_SUCCESS) { return ret; } int uid = 0; diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h index 99b45a74b..a3c4bde80 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.h @@ -141,8 +141,6 @@ public: ErrCode ConnectToCandidateConfig(int networkId) override; - ErrCode CheckRemoveCandidateConfig(void) override; - ErrCode RemoveCandidateConfig(int networkId) override; ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) override; @@ -164,6 +162,7 @@ private: static void SaBasicDump(std::string& result); static void SigHandler(int sig); static bool IsProcessNeedToRestart(); + ErrCode CheckRemoveCandidateConfig(void); #ifndef OHOS_ARCH_LITE void RegisterAppRemoved(); void UnRegisterAppRemoved(); -- Gitee From ecc509a5dd0583daa737505085525d96875f7c39 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 08:30:24 +0800 Subject: [PATCH 3/7] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/interfaces/i_wifi_device.h | 8 ++++++++ .../wifi_manage/wifi_device_service_impl.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/wifi/frameworks/native/interfaces/i_wifi_device.h b/wifi/frameworks/native/interfaces/i_wifi_device.h index 19d81d93b..4f526469b 100644 --- a/wifi/frameworks/native/interfaces/i_wifi_device.h +++ b/wifi/frameworks/native/interfaces/i_wifi_device.h @@ -92,6 +92,14 @@ public: */ virtual ErrCode RemoveCandidateConfig(int networkId) = 0; + /** + * @Description Remove the wifi candidate device config by WifiDeviceConfig + * + * @param config - the candidate config to be removed + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) = 0; + /** * @Description Connect to a candidate specified network. * diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index 7a4c0d6f9..d8d6d31e8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -495,7 +495,7 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con } /* find the networkId of the removed config */ int networkId = INVALID_NETWORK_ID; - size_t size = configs.size() + size_t size = configs.size(); for (size_t i = 0; i < size; i++) { if (configs[i].ssid == config.ssid) { networkId = configs[i].networkId; -- Gitee From 7112db12e65ed9e2782ec56ade356d46ea2e3855 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 09:19:46 +0800 Subject: [PATCH 4/7] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- .../wifi_framework/wifi_manage/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp index d8d6d31e8..632f97dff 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_device_service_impl.cpp @@ -499,7 +499,7 @@ ErrCode WifiDeviceServiceImpl::RemoveCandidateConfig(const WifiDeviceConfig &con for (size_t i = 0; i < size; i++) { if (configs[i].ssid == config.ssid) { networkId = configs[i].networkId; - WIFI_LOGI("find the removed config, networkId:%{public}d!"); + WIFI_LOGI("find the removed config, networkId:%{public}d!", networkId); break; } } -- Gitee From 3afe211bee240369f3611e82a07b894404a8e9ed Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 11:04:09 +0800 Subject: [PATCH 5/7] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/src/wifi_device_impl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/frameworks/native/src/wifi_device_impl.cpp b/wifi/frameworks/native/src/wifi_device_impl.cpp index bb6c13450..58180360a 100644 --- a/wifi/frameworks/native/src/wifi_device_impl.cpp +++ b/wifi/frameworks/native/src/wifi_device_impl.cpp @@ -109,12 +109,6 @@ ErrCode WifiDeviceImpl::PutWifiProtectRef(const std::string &protectName) return client_->PutWifiProtectRef(protectName); } -ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) -{ - RETURN_IF_FAIL(client_); - return client_->RemoveUntrustedConfig(config); -} - ErrCode WifiDeviceImpl::AddCandidateConfig(const WifiDeviceConfig &config, int &networkId) { RETURN_IF_FAIL(client_); @@ -127,6 +121,12 @@ ErrCode WifiDeviceImpl::RemoveCandidateConfig(int networkId) return client_->RemoveCandidateConfig(networkId); } +ErrCode WifiDeviceImpl::RemoveCandidateConfig(const WifiDeviceConfig &config) +{ + RETURN_IF_FAIL(client_); + return client_->RemoveCandidateConfig(config); +} + ErrCode WifiDeviceImpl::ConnectToCandidateConfig(int networkId) { RETURN_IF_FAIL(client_); -- Gitee From 3d4e3b642c10b324254519da26d18b98c7948ae3 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 15:11:58 +0800 Subject: [PATCH 6/7] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/native/include/wifi_device.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wifi/frameworks/native/include/wifi_device.h b/wifi/frameworks/native/include/wifi_device.h index 3205d2dc7..5b18abd36 100644 --- a/wifi/frameworks/native/include/wifi_device.h +++ b/wifi/frameworks/native/include/wifi_device.h @@ -85,6 +85,14 @@ public: */ virtual ErrCode RemoveCandidateConfig(int networkId) = 0; + /** + * @Description Remove a specified candidate hotspot configuration. + * + * @param config - WifiDeviceConfig object + * @return ErrCode - operation result + */ + virtual ErrCode RemoveCandidateConfig(const WifiDeviceConfig &config) = 0; + /** * @Description Connect to a candidate specified network. * -- Gitee From 856a1c87860f807d41bf8a10471dc5f814737dd4 Mon Sep 17 00:00:00 2001 From: "yanxiaotao@huawei.com" Date: Mon, 25 Jul 2022 18:59:31 +0800 Subject: [PATCH 7/7] bugfix for untrusted config 0725 Signed-off-by: yanxiaotao@huawei.com --- wifi/frameworks/js/napi/src/wifi_napi_device.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp index ae9db9044..25bef6935 100644 --- a/wifi/frameworks/js/napi/src/wifi_napi_device.cpp +++ b/wifi/frameworks/js/napi/src/wifi_napi_device.cpp @@ -422,21 +422,6 @@ napi_value AddUntrustedConfig(napi_env env, napi_callback_info info) return DoAsyncWork(env, asyncContext, argc, argv, nonCallbackArgNum); } -static int GetDeviceConfigId(WifiDeviceConfig *config) -{ - std::vector vecConfigs; - ErrCode ret = wifiDevicePtr->GetDeviceConfigs(vecConfigs); - if (ret != WIFI_OPT_SUCCESS) { - return INVALID_NETWORK_ID; - } - for (auto& each : vecConfigs) { - if (each.ssid == config->ssid) { - return each.networkId; - } - } - return INVALID_NETWORK_ID; -} - napi_value RemoveUntrustedConfig(napi_env env, napi_callback_info info) { TRACE_FUNC_CALL; -- Gitee