From f3fb9b0e689705a241dfe2e931a2bae6438efaf0 Mon Sep 17 00:00:00 2001 From: ding_dong_dong Date: Fri, 29 Aug 2025 14:42:02 +0800 Subject: [PATCH] modify access info Signed-off-by: ding_dong_dong --- .../communicator/src/softbus_adapter.h | 6 +- .../src/softbus_adapter_standard.cpp | 43 +++++----- .../communicator/src/softbus_client.cpp | 25 +++--- .../adapter/communicator/src/softbus_client.h | 11 ++- .../test/unittest/softbus_client_test.cpp | 78 ++++++++----------- 5 files changed, 75 insertions(+), 88 deletions(-) diff --git a/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h b/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h index 637df5016..04c7757cf 100644 --- a/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h +++ b/services/distributeddataservice/adapter/communicator/src/softbus_adapter.h @@ -94,10 +94,10 @@ private: Task GetCloseSessionTask(); bool CloseSession(const std::string &networkId); void GetExpireTime(std::shared_ptr &conn); - std::pair OpenConnect(const std::shared_ptr &conn, const DeviceId &deviceId); - bool ConfigSessionAccessInfo(const ExtraDataInfo &extraInfo, SessionAccessInfo &sessionAccessInfo); - std::shared_ptr GetConnect(const PipeInfo &pipeInfo, const DeviceId &deviceId, + std::pair OpenConnect(const std::shared_ptr &conn, const DeviceId &deviceId, const ExtraDataInfo &extraInfo); + bool ConfigSessionAccessInfo(const ExtraDataInfo &extraInfo, SessionAccessInfo &sessionAccessInfo); + std::shared_ptr GetConnect(const PipeInfo &pipeInfo, const DeviceId &deviceId); static constexpr Time INVALID_NEXT = std::chrono::steady_clock::time_point::max(); diff --git a/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp b/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp index 4ae3ae96f..ccc65a39e 100644 --- a/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp +++ b/services/distributeddataservice/adapter/communicator/src/softbus_adapter_standard.cpp @@ -188,7 +188,7 @@ void SoftBusAdapter::GetExpireTime(std::shared_ptr &conn) std::pair SoftBusAdapter::SendData(const PipeInfo &pipeInfo, const DeviceId &deviceId, const DataInfo &dataInfo, uint32_t length, const MessageInfo &info) { - std::shared_ptr conn = GetConnect(pipeInfo, deviceId, dataInfo.extraInfo); + std::shared_ptr conn = GetConnect(pipeInfo, deviceId); if (conn == nullptr) { return std::make_pair(Status::ERROR, 0); } @@ -197,7 +197,7 @@ std::pair SoftBusAdapter::SendData(const PipeInfo &pipeInfo, co return std::make_pair(Status::RATE_LIMIT, 0); } if (status != Status::SUCCESS) { - return OpenConnect(conn, deviceId); + return OpenConnect(conn, deviceId, dataInfo.extraInfo); } status = conn->SendData(dataInfo); if ((status != Status::NETWORK_ERROR) && (status != Status::RATE_LIMIT)) { @@ -247,8 +247,7 @@ bool SoftBusAdapter::ConfigSessionAccessInfo(const ExtraDataInfo &extraInfo, Ses return true; } -std::shared_ptr SoftBusAdapter::GetConnect(const PipeInfo &pipeInfo, const DeviceId &deviceId, - const ExtraDataInfo &extraInfo) +std::shared_ptr SoftBusAdapter::GetConnect(const PipeInfo &pipeInfo, const DeviceId &deviceId) { std::string networkId = DeviceManagerAdapter::GetInstance().ToNetworkID(deviceId.deviceId); if (networkId.empty()) { @@ -256,16 +255,10 @@ std::shared_ptr SoftBusAdapter::GetConnect(const PipeInfo &pipeIn return nullptr; } std::shared_ptr conn; - auto isOHType = DeviceManagerAdapter::GetInstance().IsOHOSType(deviceId.deviceId); - SessionAccessInfo sessionAccessInfo = { .isOHType = isOHType }; - if (isOHType && !ConfigSessionAccessInfo(extraInfo, sessionAccessInfo)) { - ZLOGE("peer device is not oh device or config accessInfo fail, deviceId:%{public}s", - Anonymous::Change(deviceId.deviceId).c_str()); - return nullptr; - } - uint32_t qosType = isOHType ? SoftBusClient::QOS_HML : SoftBusClient::QOS_BR; + uint32_t qosType = DeviceManagerAdapter::GetInstance().IsOHOSType(deviceId.deviceId) ? SoftBusClient::QOS_HML : + SoftBusClient::QOS_BR; connects_.Compute(deviceId.deviceId, - [&pipeInfo, &deviceId, &sessionAccessInfo, &conn, qosType, &networkId](const auto &key, + [&pipeInfo, &deviceId, &conn, qosType, &networkId](const auto &key, std::vector> &connects) -> bool { for (auto &connect : connects) { if (connect == nullptr) { @@ -276,7 +269,7 @@ std::shared_ptr SoftBusAdapter::GetConnect(const PipeInfo &pipeIn return true; } } - auto connect = std::make_shared(pipeInfo, deviceId, networkId, qosType, sessionAccessInfo); + auto connect = std::make_shared(pipeInfo, deviceId, networkId, qosType); connects.emplace_back(connect); conn = connect; return true; @@ -285,7 +278,7 @@ std::shared_ptr SoftBusAdapter::GetConnect(const PipeInfo &pipeIn } std::pair SoftBusAdapter::OpenConnect(const std::shared_ptr &conn, - const DeviceId &deviceId) + const DeviceId &deviceId, const ExtraDataInfo &extraInfo) { auto networkId = DeviceManagerAdapter::GetInstance().ToNetworkID(deviceId.deviceId); if (conn != nullptr) { @@ -296,13 +289,20 @@ std::pair SoftBusAdapter::OpenConnect(const std::shared_ptrUpdateNetworkId(networkId); } } + auto isOHType = DeviceManagerAdapter::GetInstance().IsOHOSType(deviceId.deviceId); + SessionAccessInfo sessionAccessInfo = { .isOHType = isOHType }; + if (isOHType && !ConfigSessionAccessInfo(extraInfo, sessionAccessInfo)) { + ZLOGE("peer device is not oh device or config accessInfo fail, isOHType:%{public}d, deviceId:%{public}s", + isOHType, Anonymous::Change(deviceId.deviceId).c_str()); + return std::make_pair(Status::ERROR, 0); + } auto applyTask = [deviceId](int32_t errcode) { CommunicatorContext::GetInstance().NotifySessionReady(deviceId.deviceId, errcode); }; - auto connectTask = [this, connect = std::weak_ptr(conn)]() { + auto connectTask = [this, connect = std::weak_ptr(conn), &sessionAccessInfo]() { auto conn = connect.lock(); if (conn != nullptr) { - conn->OpenConnect(&clientListener_); + conn->OpenConnect(&clientListener_, sessionAccessInfo); } }; ConnectManager::GetInstance()->ApplyConnect(networkId, applyTask, connectTask); @@ -713,11 +713,16 @@ Status SoftBusAdapter::ReuseConnect(const PipeInfo &pipeInfo, const DeviceId &de if (!isOHOSType) { return Status::NOT_SUPPORT; } - std::shared_ptr conn = GetConnect(pipeInfo, deviceId, extraInfo); + std::shared_ptr conn = GetConnect(pipeInfo, deviceId); if (conn == nullptr) { return Status::ERROR; } - auto status = conn->ReuseConnect(&clientListener_); + SessionAccessInfo sessionAccessInfo; + if (!ConfigSessionAccessInfo(extraInfo, sessionAccessInfo)) { + ZLOGE("config accessInfo fail, deviceId:%{public}s", Anonymous::Change(deviceId.deviceId).c_str()); + return Status::ERROR; + } + auto status = conn->ReuseConnect(&clientListener_, sessionAccessInfo); if (status != Status::SUCCESS) { return status; } diff --git a/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp b/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp index 67ec7146d..3c89dedea 100644 --- a/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp +++ b/services/distributeddataservice/adapter/communicator/src/softbus_client.cpp @@ -29,8 +29,7 @@ using namespace OHOS::DistributedKv; using namespace OHOS::DistributedData; SoftBusClient::SoftBusClient(const PipeInfo& pipeInfo, const DeviceId& deviceId, const std::string& networkId, - uint32_t type, const SessionAccessInfo &accessInfo) : type_(type), pipe_(pipeInfo), device_(deviceId), - networkId_(networkId), accessInfo_(accessInfo) + uint32_t type) : type_(type), pipe_(pipeInfo), device_(deviceId), networkId_(networkId) { mtu_ = DEFAULT_MTU_SIZE; } @@ -90,7 +89,7 @@ int32_t SoftBusClient::GetSoftBusError() return softBusError_; } -Status SoftBusClient::OpenConnect(const ISocketListener *listener) +Status SoftBusClient::OpenConnect(const ISocketListener *listener, const SessionAccessInfo &accessInfo) { std::lock_guard lock(mutex_); auto status = CheckStatus(); @@ -100,7 +99,7 @@ Status SoftBusClient::OpenConnect(const ISocketListener *listener) if (isOpening_.exchange(true)) { return Status::RATE_LIMIT; } - int32_t clientSocket = CreateSocket(); + int32_t clientSocket = CreateSocket(accessInfo); if (clientSocket <= 0) { isOpening_.store(false); return Status::NETWORK_ERROR; @@ -124,7 +123,7 @@ Status SoftBusClient::OpenConnect(const ISocketListener *listener) return Status::RATE_LIMIT; } -int32_t SoftBusClient::CreateSocket() const +int32_t SoftBusClient::CreateSocket(const SessionAccessInfo &accessInfo) const { SocketInfo socketInfo; std::string peerName = pipe_.pipeId; @@ -141,14 +140,14 @@ int32_t SoftBusClient::CreateSocket() const ZLOGE("Create the client Socket:%{public}d failed, peerName:%{public}s", socket, socketInfo.peerName); return socket; } - if (accessInfo_.isOHType) { + if (accessInfo.isOHType) { SocketAccessInfo info; - info.userId = accessInfo_.userId; - info.localTokenId = accessInfo_.tokenId; + info.userId = accessInfo.userId; + info.localTokenId = accessInfo.tokenId; AccessExtraInfo extraInfo; - extraInfo.bundleName = accessInfo_.bundleName; - extraInfo.accountId = accessInfo_.accountId; - extraInfo.storeId = accessInfo_.storeId; + extraInfo.bundleName = accessInfo.bundleName; + extraInfo.accountId = accessInfo.accountId; + extraInfo.storeId = accessInfo.storeId; std::string extraInfoStr = Serializable::Marshall(extraInfo); if (extraInfoStr.empty()) { ZLOGE("Marshall access info fail"); @@ -253,7 +252,7 @@ SoftBusClient::Time SoftBusClient::CalcExpireTime() const return std::chrono::steady_clock::now() + delay; } -Status SoftBusClient::ReuseConnect(const ISocketListener *listener) +Status SoftBusClient::ReuseConnect(const ISocketListener *listener, const SessionAccessInfo &accessInfo) { std::lock_guard lock(mutex_); auto checkStatus = CheckStatus(); @@ -261,7 +260,7 @@ Status SoftBusClient::ReuseConnect(const ISocketListener *listener) expireTime_ = CalcExpireTime(); return Status::SUCCESS; } - int32_t socket = CreateSocket(); + int32_t socket = CreateSocket(accessInfo); if (socket <= 0) { return Status::NETWORK_ERROR; } diff --git a/services/distributeddataservice/adapter/communicator/src/softbus_client.h b/services/distributeddataservice/adapter/communicator/src/softbus_client.h index f6851c974..65f1ed3af 100644 --- a/services/distributeddataservice/adapter/communicator/src/softbus_client.h +++ b/services/distributeddataservice/adapter/communicator/src/softbus_client.h @@ -56,14 +56,14 @@ public: QOS_BUTT }; - SoftBusClient(const PipeInfo &pipeInfo, const DeviceId &deviceId, const std::string& networkId, - uint32_t type = QOS_HML, const SessionAccessInfo &accessInfo = {}); + SoftBusClient(const PipeInfo &pipeInfo, const DeviceId &deviceId, const std::string &networkId, + uint32_t type = QOS_HML); ~SoftBusClient(); using Time = std::chrono::steady_clock::time_point; using Duration = std::chrono::steady_clock::duration; Status CheckStatus(); - Status OpenConnect(const ISocketListener *listener); + Status OpenConnect(const ISocketListener *listener, const SessionAccessInfo &accessInfo); Status SendData(const DataInfo &dataInfo); bool operator==(int32_t socket) const; bool operator==(const std::string &deviceId) const; @@ -73,7 +73,7 @@ public: int32_t GetSocket() const; uint32_t GetQoSType() const; int32_t GetSoftBusError(); - Status ReuseConnect(const ISocketListener *listener); + Status ReuseConnect(const ISocketListener *listener, const SessionAccessInfo &accessInfo); std::string GetNetworkId() const; void UpdateNetworkId(const std::string &networkId); @@ -81,7 +81,7 @@ private: int32_t Open(int32_t socket, uint32_t type, const ISocketListener *listener, bool async = true); std::pair GetMtu(int32_t socket); Time CalcExpireTime() const; - int32_t CreateSocket() const; + int32_t CreateSocket(const SessionAccessInfo &accessInfo) const; void UpdateBindInfo(int32_t socket, uint32_t mtu, int32_t status, bool async = true); static constexpr int32_t INVALID_SOCKET_ID = -1; @@ -122,7 +122,6 @@ private: int32_t bindState_ = -1; int32_t softBusError_ = 0; std::string networkId_; - SessionAccessInfo accessInfo_; }; } // namespace OHOS::AppDistributedKv #endif // DISTRIBUTEDDATAMGR_DATAMGR_SERVICE_SOFTBUS_CLIENT_H \ No newline at end of file diff --git a/services/distributeddataservice/adapter/communicator/test/unittest/softbus_client_test.cpp b/services/distributeddataservice/adapter/communicator/test/unittest/softbus_client_test.cpp index 9a5a3206a..6e9a16ee3 100644 --- a/services/distributeddataservice/adapter/communicator/test/unittest/softbus_client_test.cpp +++ b/services/distributeddataservice/adapter/communicator/test/unittest/softbus_client_test.cpp @@ -100,8 +100,7 @@ void SoftBusClientTest::SetUp() */ HWTEST_F(SoftBusClientTest, OperatorTest001, TestSize.Level1) { - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); ASSERT_TRUE(*connect == UUID); ASSERT_TRUE(*connect == DEFAULT_SOCKET); ASSERT_EQ(connect->GetSocket(), DEFAULT_SOCKET); @@ -114,8 +113,7 @@ HWTEST_F(SoftBusClientTest, OperatorTest001, TestSize.Level1) */ HWTEST_F(SoftBusClientTest, NetworkIdTest001, TestSize.Level1) { - auto connect = std::make_shared(pipeInfo_, deviceId_, INVALID_NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); + auto connect = std::make_shared(pipeInfo_, deviceId_, INVALID_NETWORK_ID, SoftBusClient::QOS_HML); auto networkId = connect->GetNetworkId(); ASSERT_EQ(networkId, INVALID_NETWORK_ID); connect->UpdateNetworkId(NETWORK_ID); @@ -132,9 +130,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest001, TestSize.Level1) { ConfigSocketId(INVALID_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); - auto status = connect->OpenConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); + auto status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -147,9 +144,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest002, TestSize.Level1) { ConfigSocketId(INVALID_SET_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); - auto status = connect->OpenConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); + auto status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -163,9 +159,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest003, TestSize.Level1) ConfigSocketId(INVALID_BIND_SOCKET); CommunicatorContext::GetInstance().SetThreadPool(nullptr); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); - auto status = connect->OpenConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); + auto status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -179,9 +174,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest004, TestSize.Level1) ConfigSocketId(INVALID_BIND_SOCKET); accessInfo_.isOHType = false; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_BR, - accessInfo_); - auto status = connect->OpenConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_BR); + auto status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::RATE_LIMIT); while (!(deviceListener_.isReady_)) { sleep(1); @@ -191,9 +185,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest004, TestSize.Level1) ASSERT_NE(result, 0); accessInfo_.isOHType = true; - auto ohConnect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); - status = ohConnect->OpenConnect(nullptr); + auto ohConnect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); + status = ohConnect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::RATE_LIMIT); while (!(deviceListener_.isReady_)) { sleep(1); @@ -212,9 +205,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest005, TestSize.Level1) { ConfigSocketId(INVALID_MTU_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); - auto status = connect->OpenConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); + auto status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::RATE_LIMIT); while (!(deviceListener_.isReady_)) { sleep(1); @@ -233,9 +225,8 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest006, TestSize.Level1) { ConfigSocketId(VALID_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML, - accessInfo_); - auto status = connect->OpenConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_HML); + auto status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::RATE_LIMIT); while (!(deviceListener_.isReady_)) { sleep(1); @@ -246,7 +237,7 @@ HWTEST_F(SoftBusClientTest, OpenConnectTest006, TestSize.Level1) status = connect->CheckStatus(); ASSERT_EQ(status, Status::SUCCESS); - status = connect->OpenConnect(nullptr); + status = connect->OpenConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::SUCCESS); } @@ -259,9 +250,8 @@ HWTEST_F(SoftBusClientTest, ReuseConnectTest001, TestSize.Level1) { ConfigSocketId(INVALID_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); - auto status = connect->ReuseConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); + auto status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -274,9 +264,8 @@ HWTEST_F(SoftBusClientTest, ReuseConnectTest002, TestSize.Level1) { ConfigSocketId(INVALID_SET_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); - auto status = connect->ReuseConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); + auto status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -289,9 +278,8 @@ HWTEST_F(SoftBusClientTest, ReuseConnectTest003, TestSize.Level1) { ConfigSocketId(INVALID_BIND_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); - auto status = connect->ReuseConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); + auto status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -304,9 +292,8 @@ HWTEST_F(SoftBusClientTest, ReuseConnectTest004, TestSize.Level1) { ConfigSocketId(INVALID_MTU_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); - auto status = connect->ReuseConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); + auto status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::NETWORK_ERROR); } @@ -319,9 +306,8 @@ HWTEST_F(SoftBusClientTest, ReuseConnectTest005, TestSize.Level1) { ConfigSocketId(VALID_SOCKET); accessInfo_.isOHType = true; - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); - auto status = connect->ReuseConnect(nullptr); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); + auto status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::SUCCESS); } @@ -332,14 +318,13 @@ HWTEST_F(SoftBusClientTest, ReuseConnectTest005, TestSize.Level1) */ HWTEST_F(SoftBusClientTest, SendDataTest001, TestSize.Level1) { - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); DataInfo dataInfo; auto status = connect->SendData(dataInfo); ASSERT_NE(status, Status::SUCCESS); ConfigSocketId(INVALID_SEND_SOCKET); - status = connect->ReuseConnect(nullptr); + status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::SUCCESS); status = connect->SendData(dataInfo); ASSERT_NE(status, Status::SUCCESS); @@ -353,10 +338,9 @@ HWTEST_F(SoftBusClientTest, SendDataTest001, TestSize.Level1) HWTEST_F(SoftBusClientTest, SendDataTest002, TestSize.Level1) { ConfigSocketId(VALID_SOCKET); - auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE, - accessInfo_); + auto connect = std::make_shared(pipeInfo_, deviceId_, NETWORK_ID, SoftBusClient::QOS_REUSE); DataInfo dataInfo; - auto status = connect->ReuseConnect(nullptr); + auto status = connect->ReuseConnect(nullptr, accessInfo_); ASSERT_EQ(status, Status::SUCCESS); status = connect->SendData(dataInfo); ASSERT_EQ(status, Status::SUCCESS); -- Gitee