From 4789bd24e3e88fdb18151bb9a9813ad1555d8d61 Mon Sep 17 00:00:00 2001 From: wangyb0625 Date: Thu, 24 Mar 2022 11:17:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- .../native_cpp/src/ipc/lite/ipc_client_stub.cpp | 4 +--- .../include/dependency/hichain/hichain_connector.h | 12 ++++++------ .../src/authentication/dm_auth_manager.cpp | 2 +- .../src/dependency/hichain/hichain_connector.cpp | 10 ++++------ 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp b/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp index 3549f3e2a..d692823ea 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/lite/ipc_client_stub.cpp @@ -35,9 +35,7 @@ static int32_t ClientIpcInterfaceMsgHandle(const IpcContext *ctx, void *ipcMsg, uint32_t code = 0; GetCode(ipcMsg, &code); - int32_t errCode = DM_OK; - - errCode = IpcCmdRegister::GetInstance().OnIpcCmd(code, *io); + int32_t errCode = IpcCmdRegister::GetInstance().OnIpcCmd(code, *io); LOGI("receive ipc transact code:%u, retCode=%d", code, errCode); FreeBuffer(ctx, ipcMsg); return errCode; diff --git a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h index d48e2228d..dcbebe42e 100644 --- a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h +++ b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h @@ -56,14 +56,14 @@ public: int32_t RegisterHiChainCallback(std::shared_ptr callback); int32_t UnRegisterHiChainCallback(); int32_t CreateGroup(int64_t requestId, const std::string &groupName); - int32_t AddMember(std::string deviceId, std::string &connectInfo); - int32_t DelMemberFromGroup(std::string groupId, std::string deviceId); + int32_t AddMember(const std::string &deviceId, std::string &connectInfo); + int32_t DelMemberFromGroup(const std::string &groupId, const std::string &deviceId); int32_t DeleteGroup(std::string &groupId); int32_t DeleteGroup(const int32_t userId, std::string &groupId); - bool IsDevicesInGroup(std::string hostDevice, std::string peerDevice); - int32_t GetRelatedGroups(std::string DeviceId, std::vector &groupList); - int32_t GetGroupInfo(std::string queryParams, std::vector &groupList); - int32_t GetGroupInfo(const int32_t userId, std::string queryParams, std::vector &groupList); + bool IsDevicesInGroup(const std::string &hostDevice, const std::string &peerDevice); + int32_t GetRelatedGroups(const std::string &DeviceId, std::vector &groupList); + int32_t GetGroupInfo(const std::string &queryParams, std::vector &groupList); + int32_t GetGroupInfo(const int32_t userId, const std::string &queryParams, std::vector &groupList); int32_t DeleteTimeOutGroup(const char* deviceId); private: int64_t GenRequestId(); diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index 0b26255bb..63b9ac954 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -243,7 +243,7 @@ void DmAuthManager::OnSessionOpened(int32_t sessionId, int32_t sessionSide, int3 } } -void DmAuthManager::OnSessionClosed(int32_t sessionId) +void DmAuthManager::OnSessionClosed(const int32_t sessionId) { LOGI("DmAuthManager::OnSessionOpened sessionId=%d", sessionId); } diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index 33a3b3f61..a38aaf8ac 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -195,7 +195,7 @@ int32_t HiChainConnector::GetGroupInfo(const int32_t userId, std::string queryPa LOGE("HiChainConnector::GetGroupInfo group failed, groupNum is 0."); return false; } - LOGI("HiChainConnector::GetGroupInfo group(%s), groupNum(%d)", groupVec, num); + LOGI("HiChainConnector::GetGroupInfo group(%s), groupNum(%lu)", groupVec, num); std::string relatedGroups = std::string(groupVec); deviceGroupManager_->destroyInfo(&groupVec); nlohmann::json jsonObject = nlohmann::json::parse(relatedGroups); @@ -299,8 +299,7 @@ char *HiChainConnector::onRequest(int64_t requestId, int operationCode, const ch LOGE("HiChainAuthCallBack::onRequest operationCode %d", operationCode); return nullptr; } - int32_t pinCode = 0; - pinCode = hiChainConnectorCallback_->GetPinCode(); + int32_t pinCode = hiChainConnectorCallback_->GetPinCode(); nlohmann::json jsonObj; if (pinCode == DM_FAILED) { jsonObj[FIELD_CONFIRMATION] = REQUEST_REJECTED; @@ -324,8 +323,7 @@ int64_t HiChainConnector::GenRequestId() std::string HiChainConnector::GetConnectPara(std::string deviceId, std::string reqDeviceId) { - std::string connectAddr = ""; - connectAddr = hiChainConnectorCallback_->GetConnectAddr(deviceId); + std::string connectAddr = hiChainConnectorCallback_->GetConnectAddr(deviceId); LOGE("HiChainConnector::GetConnectPara get addrInfo"); nlohmann::json jsonObject = nlohmann::json::parse(connectAddr, nullptr, false); if (jsonObject.is_discarded()) { @@ -368,7 +366,7 @@ int32_t HiChainConnector::GetRelatedGroups(std::string deviceId, std::vector groupInfos = jsonObject.get>(); - if (groupInfos.size() == 0) { + if (groupInfos.empty()) { LOGE("HiChainConnector::GetRelatedGroups group failed, groupInfos is empty."); return DM_FAILED; } -- Gitee From fde8fc44eb773881e830d01dc691186e63bb1589 Mon Sep 17 00:00:00 2001 From: wangyb0625 Date: Thu, 24 Mar 2022 11:54:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- .vscode/settings.json | 61 +++++++++++++++++++ .../dependency/hichain/hichain_connector.cpp | 12 ++-- 2 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..15f3b5b19 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,61 @@ +{ + "files.associations": { + "algorithm": "cpp", + "chrono": "cpp", + "cmath": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "deque": "cpp", + "exception": "cpp", + "functional": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "ios": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "list": "cpp", + "map": "cpp", + "memory": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "queue": "cpp", + "random": "cpp", + "ratio": "cpp", + "set": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "string": "cpp", + "system_error": "cpp", + "thread": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "typeinfo": "cpp", + "unordered_map": "cpp", + "utility": "cpp", + "vector": "cpp", + "xfacet": "cpp", + "xhash": "cpp", + "xiosbase": "cpp", + "xlocale": "cpp", + "xlocinfo": "cpp", + "xlocmon": "cpp", + "xlocnum": "cpp", + "xloctime": "cpp", + "xmemory": "cpp", + "xmemory0": "cpp", + "xstddef": "cpp", + "xstring": "cpp", + "xtr1common": "cpp", + "xtree": "cpp", + "xutility": "cpp" + } +} \ No newline at end of file diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index a38aaf8ac..6b8b0d387 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -139,7 +139,7 @@ bool HiChainConnector::IsGroupCreated(std::string groupName, GroupInfo &groupInf return false; } -int32_t HiChainConnector::GetGroupInfo(std::string queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const std::string queryParams, std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; @@ -178,7 +178,7 @@ int32_t HiChainConnector::GetGroupInfo(std::string queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string queryParams, std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; @@ -212,7 +212,7 @@ int32_t HiChainConnector::GetGroupInfo(const int32_t userId, std::string queryPa return true; } -int32_t HiChainConnector::AddMember(std::string deviceId, std::string &connectInfo) +int32_t HiChainConnector::AddMember(const std::string deviceId, std::string &connectInfo) { LOGI("HiChainConnector::AddMember"); if (deviceGroupManager_ == nullptr) { @@ -335,7 +335,7 @@ std::string HiChainConnector::GetConnectPara(std::string deviceId, std::string r return jsonObject.dump(); } -int32_t HiChainConnector::GetRelatedGroups(std::string deviceId, std::vector &groupList) +int32_t HiChainConnector::GetRelatedGroups(const std::string deviceId, std::vector &groupList) { LOGI("HiChainConnector::GetRelatedGroups Start to get local related groups."); uint32_t groupNum = 0; @@ -389,7 +389,7 @@ int32_t HiChainConnector::GetSyncGroupList(std::vector &groupList, st return DM_OK; } -bool HiChainConnector::IsDevicesInGroup(std::string hostDevice, std::string peerDevice) +bool HiChainConnector::IsDevicesInGroup(const std::string hostDevice, const std::string peerDevice) { LOGE("HiChainConnector::IsDevicesInGroup"); std::vector hostGroupInfoList; @@ -432,7 +432,7 @@ int32_t HiChainConnector::SyncGroups(std::string deviceId, std::vector Date: Thu, 24 Mar 2022 14:39:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- .vscode/settings.json | 61 ------------------- .../dependency/hichain/hichain_connector.h | 2 +- .../dependency/hichain/hichain_connector.cpp | 12 ++-- 3 files changed, 7 insertions(+), 68 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 15f3b5b19..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "files.associations": { - "algorithm": "cpp", - "chrono": "cpp", - "cmath": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "deque": "cpp", - "exception": "cpp", - "functional": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "ios": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "list": "cpp", - "map": "cpp", - "memory": "cpp", - "mutex": "cpp", - "new": "cpp", - "ostream": "cpp", - "queue": "cpp", - "random": "cpp", - "ratio": "cpp", - "set": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "string": "cpp", - "system_error": "cpp", - "thread": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "typeinfo": "cpp", - "unordered_map": "cpp", - "utility": "cpp", - "vector": "cpp", - "xfacet": "cpp", - "xhash": "cpp", - "xiosbase": "cpp", - "xlocale": "cpp", - "xlocinfo": "cpp", - "xlocmon": "cpp", - "xlocnum": "cpp", - "xloctime": "cpp", - "xmemory": "cpp", - "xmemory0": "cpp", - "xstddef": "cpp", - "xstring": "cpp", - "xtr1common": "cpp", - "xtree": "cpp", - "xutility": "cpp" - } -} \ No newline at end of file diff --git a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h index dcbebe42e..6e6991d6c 100644 --- a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h +++ b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h @@ -56,7 +56,7 @@ public: int32_t RegisterHiChainCallback(std::shared_ptr callback); int32_t UnRegisterHiChainCallback(); int32_t CreateGroup(int64_t requestId, const std::string &groupName); - int32_t AddMember(const std::string &deviceId, std::string &connectInfo); + int32_t AddMember(const std::string &deviceId, const std::string &connectInfo); int32_t DelMemberFromGroup(const std::string &groupId, const std::string &deviceId); int32_t DeleteGroup(std::string &groupId); int32_t DeleteGroup(const int32_t userId, std::string &groupId); diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index 6b8b0d387..5ddad757e 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -139,7 +139,7 @@ bool HiChainConnector::IsGroupCreated(std::string groupName, GroupInfo &groupInf return false; } -int32_t HiChainConnector::GetGroupInfo(const std::string queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const std::string &queryParams, std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; @@ -178,7 +178,7 @@ int32_t HiChainConnector::GetGroupInfo(const std::string queryParams, std::vecto return true; } -int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string &queryParams, std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; @@ -212,7 +212,7 @@ int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string q return true; } -int32_t HiChainConnector::AddMember(const std::string deviceId, std::string &connectInfo) +int32_t HiChainConnector::AddMember(const std::string &deviceId, const std::string &connectInfo) { LOGI("HiChainConnector::AddMember"); if (deviceGroupManager_ == nullptr) { @@ -335,7 +335,7 @@ std::string HiChainConnector::GetConnectPara(std::string deviceId, std::string r return jsonObject.dump(); } -int32_t HiChainConnector::GetRelatedGroups(const std::string deviceId, std::vector &groupList) +int32_t HiChainConnector::GetRelatedGroups(const std::string &deviceId, std::vector &groupList) { LOGI("HiChainConnector::GetRelatedGroups Start to get local related groups."); uint32_t groupNum = 0; @@ -389,7 +389,7 @@ int32_t HiChainConnector::GetSyncGroupList(std::vector &groupList, st return DM_OK; } -bool HiChainConnector::IsDevicesInGroup(const std::string hostDevice, const std::string peerDevice) +bool HiChainConnector::IsDevicesInGroup(const std::string &hostDevice, const std::string &peerDevice) { LOGE("HiChainConnector::IsDevicesInGroup"); std::vector hostGroupInfoList; @@ -432,7 +432,7 @@ int32_t HiChainConnector::SyncGroups(std::string deviceId, std::vector Date: Thu, 24 Mar 2022 15:37:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- .../include/authentication/dm_auth_manager.h | 3 +-- .../src/dependency/hichain/hichain_connector.cpp | 3 ++- services/devicemanagerservice/src/dependency/mini/dm_mutex.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/devicemanagerservice/include/authentication/dm_auth_manager.h b/services/devicemanagerservice/include/authentication/dm_auth_manager.h index 8a73fe200..a0d9f6b93 100644 --- a/services/devicemanagerservice/include/authentication/dm_auth_manager.h +++ b/services/devicemanagerservice/include/authentication/dm_auth_manager.h @@ -132,12 +132,11 @@ public: int32_t UnAuthenticateDevice(const std::string &pkgName, const std::string &deviceId); int32_t VerifyAuthentication(const std::string &authParam); void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result); - void OnSessionClosed(int32_t sessionId); + void OnSessionClosed(const int32_t sessionId); void OnDataReceived(int32_t sessionId, std::string message); void OnGroupCreated(int64_t requestId, const std::string &groupId); void OnMemberJoin(int64_t requestId, int32_t status); - // auth state machine int32_t EstablishAuthChannel(const std::string &deviceId); void StartNegotiate(const int32_t &sessionId); void RespNegotiate(const int32_t &sessionId); diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index 5ddad757e..db8c6e950 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -178,7 +178,8 @@ int32_t HiChainConnector::GetGroupInfo(const std::string &queryParams, std::vect return true; } -int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string &queryParams, std::vector &groupList) +int32_t HiChainConnector::GetGroupInfo(const int32_t userId, const std::string &queryParams, + std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; diff --git a/services/devicemanagerservice/src/dependency/mini/dm_mutex.cpp b/services/devicemanagerservice/src/dependency/mini/dm_mutex.cpp index eb0a0609d..6ad160791 100644 --- a/services/devicemanagerservice/src/dependency/mini/dm_mutex.cpp +++ b/services/devicemanagerservice/src/dependency/mini/dm_mutex.cpp @@ -38,4 +38,4 @@ DmMutex::~DmMutex() } } } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee