From 770f068428962f07935e6fbba38640ef8ca22866 Mon Sep 17 00:00:00 2001
From: caochao <caochao12@huawei.com>
Date: Wed, 16 Feb 2022 14:21:41 +0800
Subject: [PATCH] The same process cannot ipc communication rectification

Signed-off-by: cao_liu_chao <caochao12@huawei.com>
---
 .../src/ipc/standard/ipc_client_manager.cpp    |  1 +
 .../src/ipc/standard/ipc_client_stub.cpp       | 18 ++++++++++++++++--
 .../src/ipc/standard/ipc_server_stub.cpp       | 17 +++++++++++++++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp
index cc4db5308..06ae13b75 100644
--- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp
+++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp
@@ -18,6 +18,7 @@
 #include "device_manager_notify.h"
 #include "dm_constants.h"
 #include "dm_log.h"
+#include "ipc_client_server_proxy.h"
 #include "ipc_client_stub.h"
 #include "ipc_register_listener_req.h"
 #include "ipc_remote_broker.h"
diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp
index 748da1c82..4a6da8a26 100644
--- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp
+++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_stub.cpp
@@ -27,6 +27,7 @@ int32_t IpcClientStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Messa
 {
     LOGI("code = %d, flags= %d.", code, option.GetFlags());
     if (IpcCmdRegister::GetInstance().OnIpcCmd(code, data, reply) == DM_OK) {
+        LOGE("on ipc cmd success");
         return DM_OK;
     }
     LOGW("unsupport code: %d", code);
@@ -35,8 +36,21 @@ int32_t IpcClientStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Messa
 
 int32_t IpcClientStub::SendCmd(int32_t cmdCode, std::shared_ptr<IpcReq> req, std::shared_ptr<IpcRsp> rsp)
 {
-    LOGE("error");
-    return DM_OK;
+    LOGI("SendCmd cmdCode: %d", cmdCode);
+    MessageParcel data;
+    MessageParcel reply;
+    MessageOption option;
+    if (IpcCmdRegister::GetInstance().SetRequest(cmdCode, req, data) != DM_OK) {
+        LOGE("set request cmd failed");
+        return DM_IPC_FAILED;
+    }
+
+    LOGI("cmdCode = %d, flags= %d.", cmdCode, option.GetFlags());
+    if (IpcCmdRegister::GetInstance().OnIpcCmd(cmdCode, data, reply) == DM_OK) {
+        LOGE("on ipc cmd success");
+        return DM_OK;
+    }
+    return IpcCmdRegister::GetInstance().ReadResponse(cmdCode, reply, rsp);
 }
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp
index d1b55df74..0882adcb8 100644
--- a/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp
+++ b/services/devicemanagerservice/src/ipc/standard/ipc_server_stub.cpp
@@ -67,7 +67,7 @@ bool IpcServerStub::Init()
         }
         registerToService_ = true;
     }
-    std::thread {[] { DeviceManagerService::GetInstance().Init(); }}.detach();
+    DeviceManagerService::GetInstance().Init();
     return true;
 }
 
@@ -93,7 +93,20 @@ int32_t IpcServerStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Messa
 int32_t IpcServerStub::SendCmd(int32_t cmdCode, std::shared_ptr<IpcReq> req, std::shared_ptr<IpcRsp> rsp)
 {
     LOGI("SendCmd cmdCode: %d", cmdCode);
-    return DM_OK;
+    MessageParcel data;
+    MessageParcel reply;
+    MessageOption option;
+    if (IpcCmdRegister::GetInstance().SetRequest(cmdCode, req, data) != DM_OK) {
+        LOGE("set request cmd failed");
+        return DM_IPC_FAILED;
+    }
+
+    int32_t ret = IpcCmdRegister::GetInstance().OnIpcCmd(cmdCode, data, reply);
+    if (ret == DM_IPC_NOT_REGISTER_FUNC) {
+        LOGW("unsupport code: %d", cmdCode);
+        return IpcCmdRegister::GetInstance().ReadResponse(cmdCode, reply, rsp);
+    }
+    return ret;
 }
 
 ServiceRunningState IpcServerStub::QueryServiceState() const
-- 
Gitee