From 488c27c49bda4e6021225df1ac1dae59b378e9c8 Mon Sep 17 00:00:00 2001 From: xxxx Date: Thu, 13 Oct 2022 17:44:42 +0800 Subject: [PATCH] Description:modifies cppcheck Match-id-8774d586d668f53a9f1b53045fb723cbd09302d0 --- common/include/input_hub.cpp | 2 +- common/include/white_list_util.cpp | 4 +- .../src/distributed_input_sink_transport.cpp | 16 +- .../src/distributed_input_node_manager.cpp | 4 - .../src/distributed_input_source_manager.cpp | 20 -- .../distributed_input_source_transport.cpp | 172 +++++++++--------- utils/src/dinput_utils_tool.cpp | 18 ++ 7 files changed, 113 insertions(+), 123 deletions(-) diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index aade305..fc1dea6 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -220,7 +220,7 @@ size_t InputHub::CollectEvent(RawEvent* buffer, size_t& capacity, Device* device if (needFilted[i]) { continue; } - struct input_event& iev = readBuffer[i]; + const struct input_event& iev = readBuffer[i]; event->when = ProcessEventTimestamp(iev); event->type = iev.type; event->code = iev.code; diff --git a/common/include/white_list_util.cpp b/common/include/white_list_util.cpp index 6c2717a..fb7d7a5 100644 --- a/common/include/white_list_util.cpp +++ b/common/include/white_list_util.cpp @@ -215,7 +215,7 @@ void WhiteListUtil::GetCombKeysHash(TYPE_COMBINATION_KEY_VEC combKeys, std::unor WhiteListItemHash hash; GetAllComb(combKeys, hash, combKeys.size(), hashSets); - for (auto &hashSet : hashSets) { + for (const auto &hashSet : hashSets) { targetSet.insert(hashSet + std::to_string(lastKey[0]) + std::to_string(lastKeyAction[0])); } } @@ -274,7 +274,7 @@ int32_t WhiteListUtil::GetWhiteList(const std::string &deviceId, TYPE_WHITE_LIST std::string WhiteListUtil::GetBusinessEventHash(const BusinessEvent &event) { std::string hash = ""; - for (auto &p : event.pressedKeys) { + for (const auto &p : event.pressedKeys) { hash += std::to_string(p); } hash += std::to_string(event.keyCode); diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index 64bf741..1dac7b4 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -176,8 +176,7 @@ int32_t DistributedInputSinkTransport::RespPrepareRemoteInput( } } -int32_t DistributedInputSinkTransport::RespUnprepareRemoteInput( - const int32_t sessionId, std::string &smsg) +int32_t DistributedInputSinkTransport::RespUnprepareRemoteInput(const int32_t sessionId, std::string &smsg) { if (sessionId > 0) { DHLOGI("RespUnprepareRemoteInput sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); @@ -193,8 +192,7 @@ int32_t DistributedInputSinkTransport::RespUnprepareRemoteInput( } } -int32_t DistributedInputSinkTransport::RespStartRemoteInput( - const int32_t sessionId, std::string &smsg) +int32_t DistributedInputSinkTransport::RespStartRemoteInput(const int32_t sessionId, std::string &smsg) { if (sessionId > 0) { DHLOGI("RespStartRemoteInput sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); @@ -271,18 +269,18 @@ int32_t DistributedInputSinkTransport::SendMessage(int32_t sessionId, std::strin DHLOGE("SendMessage error: message.size() > MSG_MAX_SIZE"); return ERR_DH_INPUT_SERVER_SINK_TRANSPORT_SENDMESSAGE_FAIL; } - uint8_t *buf = (uint8_t *)calloc((MSG_MAX_SIZE), sizeof(uint8_t)); + uint8_t *buf = reinterpret_cast(calloc((MSG_MAX_SIZE), sizeof(uint8_t))); if (buf == nullptr) { DHLOGE("SendMessage: malloc memory failed"); return ERR_DH_INPUT_SERVER_SINK_TRANSPORT_SENDMESSAGE_FAIL; } int32_t outLen = 0; - if (memcpy_s(buf, MSG_MAX_SIZE, (const uint8_t *)message.c_str(), message.size()) != DH_SUCCESS) { + if (memcpy_s(buf, MSG_MAX_SIZE, reinterpret_cast(message.c_str()), message.size()) != EOK) { DHLOGE("SendMessage: memcpy memory failed"); free(buf); return ERR_DH_INPUT_SERVER_SINK_TRANSPORT_SENDMESSAGE_FAIL; } - outLen = (int32_t)(message.size()); + outLen = static_cast(message.size()); int32_t ret = SendBytes(sessionId, buf, outLen); free(buf); return ret; @@ -382,13 +380,13 @@ void DistributedInputSinkTransport::OnBytesReceived(int32_t sessionId, const voi return; } - uint8_t *buf = (uint8_t *)calloc(dataLen + 1, sizeof(uint8_t)); + uint8_t *buf = reinterpret_cast(calloc(dataLen + 1, sizeof(uint8_t))); if (buf == nullptr) { DHLOGE("OnBytesReceived: malloc memory failed"); return; } - if (memcpy_s(buf, dataLen + 1, (const uint8_t*)data, dataLen) != DH_SUCCESS) { + if (memcpy_s(buf, dataLen + 1, reinterpret_cast(data), dataLen) != EOK) { DHLOGE("OnBytesReceived: memcpy memory failed"); free(buf); return; diff --git a/services/source/inputinject/src/distributed_input_node_manager.cpp b/services/source/inputinject/src/distributed_input_node_manager.cpp index 25470ac..31098dd 100644 --- a/services/source/inputinject/src/distributed_input_node_manager.cpp +++ b/services/source/inputinject/src/distributed_input_node_manager.cpp @@ -130,10 +130,6 @@ int32_t DistributedInputNodeManager::CreateVirtualTouchScreenNode(const std::str DHLOGI("CreateVirtualTouchScreenNode start, dhId: %s, sourcePhyWidth: %d, sourcePhyHeight: %d", GetAnonyString(dhId).c_str(), sourcePhyWidth, sourcePhyHeight); device = std::make_unique(info.deviceInfo, info, sourcePhyWidth - 1, sourcePhyHeight - 1); - if (device == nullptr) { - DHLOGE("could not create new virtual touch Screen"); - return ERR_DH_INPUT_SERVER_SOURCE_CREATE_HANDLE_FAIL; - } if (!device->SetUp(devId, dhId)) { DHLOGE("Virtual touch Screen setUp fail, devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 5a96103..6afe55d 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -292,11 +292,6 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseStartRemoteI } std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("onResponseStartRemoteInputDhid jsonArrayMsg is null."); - return; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_DEVID] = deviceId; tmpJson[INPUT_SOURCEMANAGER_KEY_DHID] = dhids; @@ -324,11 +319,6 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseStopRemoteIn return; } std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("onResponseStartRemoteInputDhid jsonArrayMsg is null."); - return; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_DEVID] = deviceId; tmpJson[INPUT_SOURCEMANAGER_KEY_DHID] = dhids; @@ -413,11 +403,6 @@ void DistributedInputSourceManager::DInputSourceListener::onReceiveRelayPrepareR return; } std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("jsonArrayMsg is null."); - return; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_SRC_DEVID] = srcId; tmpJson[INPUT_SOURCEMANAGER_KEY_SINK_DEVID] = sinkId; @@ -441,11 +426,6 @@ void DistributedInputSourceManager::DInputSourceListener::onReceiveRelayUnprepar return; } std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("jsonArrayMsg is null."); - return; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_SRC_DEVID] = srcId; tmpJson[INPUT_SOURCEMANAGER_KEY_SINK_DEVID] = sinkId; diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 90a244b..d44e26e 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -210,8 +210,7 @@ int32_t DistributedInputSourceTransport::OpenInputSoftbus(const std::string &rem int sessionId = OpenSession(mySessionName_.c_str(), peerSessionName.c_str(), remoteDevId.c_str(), GROUP_ID.c_str(), &g_sessionAttr); if (sessionId < 0) { - DHLOGE("OpenSession fail, remoteDevId: %s, sessionId: %d", - GetAnonyString(remoteDevId).c_str(), sessionId); + DHLOGE("OpenSession fail, remoteDevId: %s, sessionId: %d", GetAnonyString(remoteDevId).c_str(), sessionId); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_OPEN_SESSION_START, DINPUT_OPEN_SESSION_TASK); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_OPEN_SESSION_FAIL; } @@ -239,8 +238,7 @@ int32_t DistributedInputSourceTransport::OpenInputSoftbus(const std::string &rem StartLatencyThread(remoteDevId); DistributedInputInject::GetInstance().StartInjectThread(); - DHLOGI("OpenSession success, remoteDevId:%s, sessionId: %d", - GetAnonyString(remoteDevId).c_str(), sessionId); + DHLOGI("OpenSession success, remoteDevId:%s, sessionId: %d", GetAnonyString(remoteDevId).c_str(), sessionId); sessionId_ = sessionId; #ifdef DINPUT_LOW_LATENCY @@ -299,8 +297,7 @@ int32_t DistributedInputSourceTransport::OpenInputSoftbusForRelay(const std::str int sessionId = OpenSession(mySessionName_.c_str(), peerSessionName.c_str(), srcId.c_str(), GROUP_ID.c_str(), &g_sessionAttr); if (sessionId < 0) { - DHLOGE("OpenSession fail, remoteDevId: %s, sessionId: %s", GetAnonyString(srcId).c_str(), - GetAnonyInt32(sessionId).c_str()); + DHLOGE("OpenSession fail, remoteDevId: %s, sessionId: %d", GetAnonyString(srcId).c_str(), sessionId); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_OPEN_SESSION_START, DINPUT_OPEN_SESSION_TASK); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_OPEN_SESSION_FAIL; } @@ -319,8 +316,7 @@ int32_t DistributedInputSourceTransport::OpenInputSoftbusForRelay(const std::str auto status = openSessionWaitCond_.wait_for(waitLock, std::chrono::seconds(SESSION_WAIT_TIMEOUT_SECOND), [this, sessionId] () { return channelStatusMap_[sessionId]; }); if (!status) { - DHLOGE("OpenSession timeout, remoteDevId: %s, sessionId: %s", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str()); + DHLOGE("OpenSession timeout, remoteDevId: %s, sessionId: %d", GetAnonyString(srcId).c_str(), sessionId); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_OPEN_SESSION_TIMEOUT; } } @@ -329,8 +325,7 @@ int32_t DistributedInputSourceTransport::OpenInputSoftbusForRelay(const std::str DInputLowLatency::GetInstance().EnableSourceLowLatency(); #endif - DHLOGI("OpenSession success, remoteDevId:%s, sessionId:%s", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str()); + DHLOGI("OpenSession success, remoteDevId:%s, sessionId:%d", GetAnonyString(srcId).c_str(), sessionId); HiDumper::GetInstance().SetSessionStatus(srcId, SessionStatus::OPENED); return DH_SUCCESS; } @@ -375,12 +370,12 @@ int32_t DistributedInputSourceTransport::PrepareRemoteInput(const std::string& d std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("PrepareRemoteInput deviceId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("PrepareRemoteInput deviceId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_PREPARE_FAIL; } - DHLOGI("PrepareRemoteInput devId:%s, sessionId:%s, msg:%s.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("PrepareRemoteInput devId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -400,12 +395,12 @@ int32_t DistributedInputSourceTransport::UnprepareRemoteInput(const std::string& std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("UnprepareRemoteInput deviceId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("UnprepareRemoteInput deviceId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_UNPREPARE_FAIL; } - DHLOGI("UnprepareRemoteInput deviceId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("UnprepareRemoteInput deviceId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -427,11 +422,11 @@ int32_t DistributedInputSourceTransport::PrepareRemoteInput(int32_t srcTsrcSeId, int32_t ret = SendMsg(sinkSessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("PrepareRemoteInput deviceId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_PREPARE_FAIL; } DHLOGI("PrepareRemoteInput send success, devId:%s, msg:%s.", - GetAnonyString(deviceId).c_str(), smsg.c_str()); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -452,11 +447,11 @@ int32_t DistributedInputSourceTransport::UnprepareRemoteInput(int32_t srcTsrcSeI int32_t ret = SendMsg(sinkSessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("UnprepareRemoteInput deviceId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_UNPREPARE_FAIL; } DHLOGI("UnprepareRemoteInput send success, devId:%s, msg:%s.", - GetAnonyString(deviceId).c_str(), smsg.c_str()); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -479,10 +474,11 @@ int32_t DistributedInputSourceTransport::StartRemoteInputDhids(int32_t srcTsrcSe int32_t ret = SendMsg(sinkSessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("StartRemoteInputDhids deviceId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("StartRemoteInputDhids send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), smsg.c_str()); + DHLOGI("StartRemoteInputDhids send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), + SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -505,10 +501,11 @@ int32_t DistributedInputSourceTransport::StopRemoteInputDhids(int32_t srcTsrcSeI int32_t ret = SendMsg(sinkSessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("StopRemoteInputDhids deviceId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("StopRemoteInputDhids send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), smsg.c_str()); + DHLOGI("StopRemoteInputDhids send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), + SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -534,7 +531,8 @@ int32_t DistributedInputSourceTransport::StartRemoteInputType(int32_t srcTsrcSeI GetAnonyString(deviceId).c_str(), smsg.c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("StartRemoteInputType send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), smsg.c_str()); + DHLOGI("StartRemoteInputType send success, devId:%s, smsg:%s.", GetAnonyString(deviceId).c_str(), + SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -557,10 +555,11 @@ int32_t DistributedInputSourceTransport::StopRemoteInputType(int32_t srcTsrcSeId int32_t ret = SendMsg(sinkSessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("StopRemoteInputType deviceId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("StopRemoteInputType send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), smsg.c_str()); + DHLOGI("StopRemoteInputType send success, devId:%s, msg:%s.", GetAnonyString(deviceId).c_str(), + SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -579,12 +578,12 @@ int32_t DistributedInputSourceTransport::SendRelayPrepareRequest(const std::stri std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("SendRelayPrepareRequest srcId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("SendRelayPrepareRequest srcId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_PREPARE_FAIL; } - DHLOGI("SendRelayPrepareRequest srcId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("SendRelayPrepareRequest srcId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -603,12 +602,12 @@ int32_t DistributedInputSourceTransport::SendRelayUnprepareRequest(const std::st std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("SendRelayUnprepareRequest srcId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("SendRelayUnprepareRequest srcId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_PREPARE_FAIL; } DHLOGI("SendRelayUnprepareRequest srcId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -625,11 +624,11 @@ int32_t DistributedInputSourceTransport::NotifyOriginPrepareResult(int32_t srcTs std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(srcTsrcSeId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("NotifyOriginPrepareResult srcTsrcSeId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyInt32(srcTsrcSeId).c_str(), smsg.c_str(), ret); + DHLOGE("NotifyOriginPrepareResult srcTsrcSeId:%d, smsg:%s, SendMsg error, ret:%d.", + srcTsrcSeId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_PREPARE_FAIL; } - DHLOGI("NotifyOriginPrepareResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, smsg.c_str()); + DHLOGI("NotifyOriginPrepareResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -646,11 +645,11 @@ int32_t DistributedInputSourceTransport::NotifyOriginUnprepareResult(int32_t src std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(srcTsrcSeId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("NotifyOriginUnprepareResult srcTsrcSeId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyInt32(srcTsrcSeId).c_str(), smsg.c_str(), ret); + DHLOGE("NotifyOriginUnprepareResult srcTsrcSeId:%d, smsg:%s, SendMsg error, ret:%d.", + srcTsrcSeId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_UNPREPARE_FAIL; } - DHLOGI("NotifyOriginUnprepareResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, smsg.c_str()); + DHLOGI("NotifyOriginUnprepareResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -668,11 +667,11 @@ int32_t DistributedInputSourceTransport::NotifyOriginStartDhidResult(int32_t src std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(srcTsrcSeId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("NotifyOriginStartDhidResult srcTsrcSeId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyInt32(srcTsrcSeId).c_str(), smsg.c_str(), ret); + DHLOGE("NotifyOriginStartDhidResult srcTsrcSeId:%d, smsg:%s, SendMsg error, ret:%d.", + srcTsrcSeId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("NotifyOriginStartDhidResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, smsg.c_str()); + DHLOGI("NotifyOriginStartDhidResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -690,11 +689,11 @@ int32_t DistributedInputSourceTransport::NotifyOriginStopDhidResult(int32_t srcT std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(srcTsrcSeId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("NotifyOriginStopDhidResult srcTsrcSeId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyInt32(srcTsrcSeId).c_str(), smsg.c_str(), ret); + DHLOGE("NotifyOriginStopDhidResult srcTsrcSeId:%d, smsg:%s, SendMsg error, ret:%d.", + srcTsrcSeId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("NotifyOriginStopDhidResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, smsg.c_str()); + DHLOGI("NotifyOriginStopDhidResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -712,11 +711,11 @@ int32_t DistributedInputSourceTransport::NotifyOriginStartTypeResult(int32_t src std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(srcTsrcSeId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("NotifyOriginStartTypeResult srcTsrcSeId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyInt32(srcTsrcSeId).c_str(), smsg.c_str(), ret); + DHLOGE("NotifyOriginStartTypeResult srcTsrcSeId:%d, smsg:%s, SendMsg error, ret:%d.", + srcTsrcSeId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("NotifyOriginStartTypeResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, smsg.c_str()); + DHLOGI("NotifyOriginStartTypeResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -734,11 +733,11 @@ int32_t DistributedInputSourceTransport::NotifyOriginStopTypeResult(int32_t srcT std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(srcTsrcSeId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("NotifyOriginStopTypeResult srcTsrcSeId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyInt32(srcTsrcSeId).c_str(), smsg.c_str(), ret); + DHLOGE("NotifyOriginStopTypeResult srcTsrcSeId:%d, smsg:%s, SendMsg error, ret:%d.", + srcTsrcSeId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("NotifyOriginStopTypeResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, smsg.c_str()); + DHLOGI("NotifyOriginStopTypeResult srcTsrcSeId:%d, smsg:%s.", srcTsrcSeId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -761,12 +760,12 @@ int32_t DistributedInputSourceTransport::StartRemoteInput( std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("StartRemoteInput deviceId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("StartRemoteInput deviceId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("StartRemoteInput deviceId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("StartRemoteInput deviceId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -788,12 +787,12 @@ int32_t DistributedInputSourceTransport::StopRemoteInput( std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("StopRemoteInput deviceId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("StopRemoteInput deviceId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("StopRemoteInput deviceId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(deviceId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("StopRemoteInput deviceId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -932,12 +931,12 @@ int32_t DistributedInputSourceTransport::SendRelayStartDhidRequest(const std::st std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("SendRelayStartDhidRequest srcId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("SendRelayStartDhidRequest srcId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("SendRelayStartDhidRequest srcId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("SendRelayStartDhidRequest srcId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -958,12 +957,12 @@ int32_t DistributedInputSourceTransport::SendRelayStopDhidRequest(const std::str std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("SendRelayStopDhidRequest srcId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("SendRelayStopDhidRequest srcId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("SendRelayStopDhidRequest srcId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("SendRelayStopDhidRequest srcId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -984,12 +983,12 @@ int32_t DistributedInputSourceTransport::SendRelayStartTypeRequest(const std::st std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("SendRelayStartTypeRequest srcId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("SendRelayStartTypeRequest srcId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } - DHLOGI("SendRelayStartTypeRequest srcId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("SendRelayStartTypeRequest srcId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -1010,12 +1009,12 @@ int32_t DistributedInputSourceTransport::SendRelayStopTypeRequest(const std::str std::string smsg = jsonStr.dump(); int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { - DHLOGE("SendRelayStopTypeRequest srcId:%s, sessionId:%s, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str(), ret); + DHLOGE("SendRelayStopTypeRequest srcId:%s, sessionId:%d, smsg:%s, SendMsg error, ret:%d.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } - DHLOGI("SendRelayStopTypeRequest srcId:%s, sessionId:%s, smsg:%s.", - GetAnonyString(srcId).c_str(), GetAnonyInt32(sessionId).c_str(), smsg.c_str()); + DHLOGI("SendRelayStopTypeRequest srcId:%s, sessionId:%d, smsg:%s.", + GetAnonyString(srcId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -1077,12 +1076,12 @@ int32_t DistributedInputSourceTransport::OnSessionOpened(int32_t sessionId, int3 mySessionName, peerSessionName, GetAnonyString(peerDevId).c_str()); if (sessionSide == AUTH_SESSION_SIDE_SERVER) { - DHLOGI("session open succeed, sessionId:%s, sessionSide:service", GetAnonyInt32(sessionId).c_str()); + DHLOGI("session open succeed, sessionId:%d, sessionSide:service", sessionId); std::lock_guard notifyLock(operationMutex_); DInputSessionInfo sessionInfo{true, peerDevId}; sessionDevMap_[sessionId] = sessionInfo; } else { - DHLOGI("session open succeed, sessionId:%s, sessionSide:client", GetAnonyInt32(sessionId).c_str()); + DHLOGI("session open succeed, sessionId:%d, sessionSide:client", sessionId); std::lock_guard notifyLock(operationMutex_); channelStatusMap_[sessionId] = true; openSessionWaitCond_.notify_all(); @@ -1094,8 +1093,7 @@ int32_t DistributedInputSourceTransport::OnSessionOpened(int32_t sessionId, int3 void DistributedInputSourceTransport::OnSessionClosed(int32_t sessionId) { std::string deviceId = FindDeviceBySession(sessionId); - DHLOGI("OnSessionClosed, sessionId: %d, deviceId:%s", - sessionId, GetAnonyString(deviceId).c_str()); + DHLOGI("OnSessionClosed, sessionId: %d, deviceId:%s", sessionId, GetAnonyString(deviceId).c_str()); std::unique_lock sessionLock(operationMutex_); if (sessionDevMap_.count(sessionId) > 0) { sessionDevMap_.erase(sessionId); @@ -1684,13 +1682,13 @@ void DistributedInputSourceTransport::OnBytesReceived(int32_t sessionId, const v return; } - uint8_t *buf = (uint8_t *)calloc(dataLen + 1, sizeof(uint8_t)); + uint8_t *buf = reinterpret_cast(calloc(dataLen + 1, sizeof(uint8_t))); if (buf == nullptr) { DHLOGE("OnBytesReceived: malloc memory failed"); return; } - if (memcpy_s(buf, dataLen + 1, (const uint8_t*)data, dataLen) != DH_SUCCESS) { + if (memcpy_s(buf, dataLen + 1, reinterpret_cast(data), dataLen) != EOK) { DHLOGE("OnBytesReceived: memcpy memory failed"); free(buf); return; @@ -1718,18 +1716,18 @@ int32_t DistributedInputSourceTransport::SendMsg(int32_t sessionId, std::string DHLOGE("SendMessage error: message.size() > MSG_MAX_SIZE"); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_SENDMESSSAGE; } - uint8_t *buf = (uint8_t *)calloc((MSG_MAX_SIZE), sizeof(uint8_t)); + uint8_t *buf = reinterpret_cast(calloc((MSG_MAX_SIZE), sizeof(uint8_t))); if (buf == nullptr) { DHLOGE("SendMsg: malloc memory failed"); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_SENDMESSSAGE; } int32_t outLen = 0; - if (memcpy_s(buf, MSG_MAX_SIZE, (const uint8_t *)message.c_str(), message.size()) != DH_SUCCESS) { + if (memcpy_s(buf, MSG_MAX_SIZE, reinterpret_cast(message.c_str()), message.size()) != EOK) { DHLOGE("SendMsg: memcpy memory failed"); free(buf); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_SENDMESSSAGE; } - outLen = (int32_t)message.size(); + outLen = static_cast(message.size()); int32_t ret = SendBytes(sessionId, buf, outLen); free(buf); return ret; diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 9ff30fd..4938a40 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -98,6 +98,24 @@ std::string SetAnonyId(const std::string &message) if (IsString(jsonObj, DINPUT_SOFTBUS_KEY_INPUT_DATA)) { jsonObj[DINPUT_SOFTBUS_KEY_INPUT_DATA] = GetAnonyString(jsonObj[DINPUT_SOFTBUS_KEY_INPUT_DATA]); } + if (IsString(jsonObj, DINPUT_SOFTBUS_KEY_VECTOR_DHID)) { + std::string dhidStr = jsonObj[DINPUT_SOFTBUS_KEY_VECTOR_DHID]; + dhidStr.append("."); + size_t pos = dhidStr.find("."); + std::string anonyDhidStr = ""; + while (pos != dhidStr.npos) { + anonyDhidStr += GetAnonyString(dhidStr.substr(0, pos)) + "."; + dhidStr = dhidStr.substr(pos + 1, dhidStr.size()); + pos = dhidStr.find("."); + } + jsonObj[DINPUT_SOFTBUS_KEY_VECTOR_DHID] = anonyDhidStr.substr(0, anonyDhidStr.length() - 1); + } + if (IsString(jsonObj, DINPUT_SOFTBUS_KEY_SRC_DEV_ID)) { + jsonObj[DINPUT_SOFTBUS_KEY_SRC_DEV_ID] = GetAnonyString(jsonObj[DINPUT_SOFTBUS_KEY_SRC_DEV_ID]); + } + if (IsString(jsonObj, DINPUT_SOFTBUS_KEY_SINK_DEV_ID)) { + jsonObj[DINPUT_SOFTBUS_KEY_SINK_DEV_ID] = GetAnonyString(jsonObj[DINPUT_SOFTBUS_KEY_SINK_DEV_ID]); + } return jsonObj.dump(); }