diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp index 127910f94fefc1da8b01686198cd436fcd1eeadd..ea7ffd5ead9692907ad7512de6da2a6ed9e8eeba 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp @@ -101,7 +101,7 @@ int32_t DScreenSourceProxy::RegisterDistributedHardware(const std::string &devId } if (!data.WriteString(devId) || !data.WriteString(dhId) || - !data.WriteString(param.version) || !data.WriteString(param.attrs) || !data.WriteString(reqId)) { + !data.WriteString(param.sinkVersion) || !data.WriteString(param.sinkAttrs) || !data.WriteString(reqId)) { DHLOGE("Write param failed."); return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } @@ -214,8 +214,8 @@ bool DScreenSourceProxy::CheckRegParams(const std::string &devId, const std::str DHLOGE("DScreenSourceProxy CheckRegParams reqId is invalid."); return false; } - if (param.version.empty() || param.version.size() > PARAM_MAX_SIZE || param.attrs.empty() || - param.attrs.size() > PARAM_MAX_SIZE) { + if (param.sinkVersion.empty() || param.sinkVersion.size() > PARAM_MAX_SIZE || param.sinkAttrs.empty() || + param.sinkAttrs.size() > PARAM_MAX_SIZE) { DHLOGE("DScreenSourceProxy CheckRegParams param is invalid."); return false; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp index aa3473785b3201d08762cee5144a4ef9b30abb7c..a820169cf7c10a6e27ac3260c5c44c94d548449f 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp @@ -34,8 +34,8 @@ void RegisterDistributedHardwareFuzzTest(const uint8_t* data, size_t size) std::string version(reinterpret_cast(data), size); std::string attrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sinkVersion = version; + param.sinkAttrs = attrs; std::shared_ptr callback = std::make_shared(); DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp index 1be5ab181acdd0dcd737945da1887bf875b30e99..cb91b02b56e95f7a324b396de3252ebb12be268c 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp @@ -38,8 +38,8 @@ void RegisterDistributedHardwareFuzzTest(const uint8_t* data, size_t size) std::string version(reinterpret_cast(data), size); std::string attrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sinkVersion = version; + param.sinkAttrs = attrs; sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index 98d62ce9627b0094bfb191f4f109cabae42e62a4..c69e255d296f14c0a16e633457a44b2e41803fc7 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -81,8 +81,8 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_001, TestSize.Lev const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "2.0"; - param.attrs = "attrs"; + param.sinkVersion = "2.0"; + param.sinkAttrs = "attrs"; std::string callbackParam = "callbackParam"; sptr loadCallback(new DScreenSourceLoadCallback(callbackParam)); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, nullptr); @@ -102,8 +102,8 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_002, TestSize.Lev const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::string callbackParam = "callbackParam"; sptr loadCallback(new DScreenSourceLoadCallback(callbackParam)); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, nullptr); @@ -124,8 +124,8 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_003, TestSize.Lev const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); DScreenSourceHandler::GetInstance().dScreenSourceCallback_ = nullptr; int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); @@ -143,8 +143,8 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_004, TestSize.Lev const std::string devId = ""; const std::string dhId = ""; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_EQ(ERR_DH_SCREEN_STRING_PARAM_EMPTY, ret); @@ -161,8 +161,8 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_005, TestSize.Lev const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = nullptr; int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_EQ(ERR_DH_SCREEN_REGISTER_CALLBACK_NOT_INIT, ret); @@ -182,8 +182,8 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_006, TestSize.Lev devIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevIddevId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); if (DScreenSourceHandler::GetInstance().dScreenSourceCallback_ == nullptr) { DScreenSourceHandler::GetInstance().dScreenSourceCallback_ = new (std::nothrow) DScreenSourceCallback(); diff --git a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp index 418fd302e2775a1831af39026b9b8ec92f80e4af..574650e44c35f9ad19cd46c290054188aa862b16 100644 --- a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp @@ -231,7 +231,7 @@ int32_t DScreenManager::EnableDistributedScreen(const std::string &devId, const { DHLOGI("EnableDistributedScreen1.0, devId: %s, dhId:%s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - if (devId.empty() || dhId.empty() || param.version.empty() || param.attrs.empty() || reqId.empty()) { + if (devId.empty() || dhId.empty() || param.sinkVersion.empty() || param.sinkAttrs.empty() || reqId.empty()) { DHLOGE("EnableDistributedScreen1.0 CheckRegParams is inlvalid."); return ERR_DH_SCREEN_SA_ENABLE_FAILED; } @@ -259,9 +259,9 @@ int32_t DScreenManager::EnableDistributedScreen(const std::string &devId, const DHLOGI("dScreen state Already is ENABLED or ENABLING."); return DH_SUCCESS; } - dScreen ->SetScreenVersion(param.version); + dScreen ->SetScreenVersion(param.sinkVersion); dScreens_[dScreenIdx] = dScreen; - int32_t ret = dScreen->AddTask(std::make_shared(TaskType::TASK_ENABLE, reqId, param.attrs)); + int32_t ret = dScreen->AddTask(std::make_shared(TaskType::TASK_ENABLE, reqId, param.sinkAttrs)); if (ret != DH_SUCCESS) { DHLOGE("EnableDistributedScreen, add task failed. devId: %s, dhId:%s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp index 81ca68be55d9f68f60b5766ea1a455ad75c309f5..a606d2d642a3d5dbb323e41876684a0ea1c5ef9a 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen_manager.cpp @@ -226,7 +226,7 @@ int32_t DScreenManager::EnableDistributedScreen(const std::string &devId, const { DHLOGI("EnableDistributedScreen2.0, devId: %s, dhId:%s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - if (devId.empty() || dhId.empty() || param.version.empty() || param.attrs.empty() || reqId.empty()) { + if (devId.empty() || dhId.empty() || param.sinkVersion.empty() || param.sinkAttrs.empty() || reqId.empty()) { DHLOGE("EnableDistributedScreen2.0 CheckRegParams is inlvalid."); return ERR_DH_SCREEN_SA_ENABLE_FAILED; } @@ -255,7 +255,7 @@ int32_t DScreenManager::EnableDistributedScreen(const std::string &devId, const return DH_SUCCESS; } dScreens_[dScreenIdx] = dScreen; - int32_t ret = dScreen->AddTask(std::make_shared(TaskType::TASK_ENABLE, reqId, param.attrs)); + int32_t ret = dScreen->AddTask(std::make_shared(TaskType::TASK_ENABLE, reqId, param.sinkAttrs)); if (ret != DH_SUCCESS) { DHLOGE("EnableDistributedScreen, add task failed. devId: %s, dhId:%s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index a42d21a2690c3023ab3e47fe2b81a78fa603445d..ce23642628713975f146c5aae6159976cc3f50e9 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -125,16 +125,16 @@ int32_t DScreenSourceService::ReleaseSource() int32_t DScreenSourceService::RegisterDistributedHardware(const std::string &devId, const std::string &dhId, const EnableParam ¶m, const std::string &reqId) { - DHLOGI("Register source distributed screen, peer dscreen version: %s", param.version.c_str()); + DHLOGI("Register source distributed screen, peer dscreen version: %s", param.sinkVersion.c_str()); int32_t ret = DH_SUCCESS; - if (IsSupportAVTransEngine(param.version)) { + if (IsSupportAVTransEngine(param.sinkVersion)) { ret = V2_0::DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); } else { ret = V1_0::DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, param, reqId); } if (ret != DH_SUCCESS) { DHLOGE("enable distributedScreen failed. devId: %s, dhId: %s, reqId: %s, param attrs: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str(), param.attrs.c_str()); + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str(), param.sinkAttrs.c_str()); ReportRegisterFail(DSCREEN_REGISTER_FAIL, ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), "enable distributedScreen failed."); return ERR_DH_SCREEN_SA_ENABLE_FAILED; diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp index 7e6f242e4476a7ccfa3614971323498f4dc32904..dc37785b5301821d3299c5daee3b43da0fd7ab3a 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp @@ -132,8 +132,8 @@ int32_t DScreenSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, return ERR_DH_SCREEN_INPUT_PARAM_INVALID; } EnableParam enableParam; - enableParam.version = version; - enableParam.attrs = attrs; + enableParam.sinkVersion = version; + enableParam.sinkAttrs = attrs; int32_t ret = RegisterDistributedHardware(devId, dhId, enableParam, reqId); reply.WriteInt32(ret); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp index b763d132e179049779ef87dcfab5ec7c5bdc8b75..9c2540d118526bc53bf5599185b1eab79722fa0c 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp @@ -137,8 +137,8 @@ HWTEST_F(DScreenSourceStubTest, RegisterDistributedHardware_001, TestSize.Level1 DScreenSourceProxy sourceProxy(sourceStubPtr); EnableParam param; - param.version = ""; - param.attrs = ""; + param.sinkVersion = ""; + param.sinkAttrs = ""; int32_t ret = sourceProxy.RegisterDistributedHardware("", "dhId000", param, "reqId000"); EXPECT_EQ(ERR_DH_SCREEN_INPUT_PARAM_INVALID, ret); @@ -163,11 +163,11 @@ HWTEST_F(DScreenSourceStubTest, RegisterDistributedHardware_001, TestSize.Level1 ret = sourceProxy.RegisterDistributedHardware("devId000", "dhId000", param, "reqId000"); EXPECT_EQ(ERR_DH_SCREEN_INPUT_PARAM_INVALID, ret); - param.version = "1"; + param.sinkVersion = "1"; ret = sourceProxy.RegisterDistributedHardware("devId000", "dhId000", param, "reqId000"); EXPECT_EQ(ERR_DH_SCREEN_INPUT_PARAM_INVALID, ret); - param.attrs = "attrs"; + param.sinkAttrs = "attrs"; ret = sourceProxy.RegisterDistributedHardware("devId000", "dhId000", param, "reqId000"); EXPECT_EQ(DH_SUCCESS, ret); }