From 89e183d047654f2cdf3e7485f3a7e4949d311178 Mon Sep 17 00:00:00 2001 From: xxxx Date: Wed, 21 Sep 2022 14:48:36 +0800 Subject: [PATCH] Description:amend log Match-id-00461f6f1dff2b55db1473a4596f33031fe47f86 --- common/include/idinput_dbg_itf.h | 35 ---------- common/include/input_hub.cpp | 6 +- common/mock/session_mock.cpp | 5 +- .../ipc/src/distributed_input_client.cpp | 3 +- .../src/distributed_input_collector.cpp | 8 +-- .../src/distributed_input_sink_manager.cpp | 12 ++-- .../distributed_input_source_manager.h | 5 -- .../src/distributed_input_source_manager.cpp | 70 ++++--------------- .../distributed_input_source_transport.cpp | 7 +- utils/src/dinput_utils_tool.cpp | 3 + 10 files changed, 36 insertions(+), 118 deletions(-) delete mode 100644 common/include/idinput_dbg_itf.h diff --git a/common/include/idinput_dbg_itf.h b/common/include/idinput_dbg_itf.h deleted file mode 100644 index 66e8a81..0000000 --- a/common/include/idinput_dbg_itf.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_DINPUT_DBG_ITF_H -#define OHOS_DINPUT_DBG_ITF_H - -#include -#include - -namespace OHOS { -namespace DistributedHardware { -namespace DistributedInput { -const std::string GET_DBG_ITF_FUNC = "GetDBGItf"; -class IDInputDBGItf { -public: - virtual int32_t Init() = 0; -}; -extern "C" __attribute__((visibility("default"))) IDInputDBGItf* GetDBGItf(); -} -} -} - -#endif \ No newline at end of file diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index 011117d..19bab0f 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -960,7 +960,7 @@ AffectDhIds InputHub::SetSupportInputType(bool enabled, const uint32_t &inputTyp for (const auto &[id, device] : devices_) { if (device->classes & inputTypes_) { device->isShare = enabled; - DHLOGW("ByType dhid:%s, isshare:%d", device->identifier.descriptor.c_str(), enabled); + DHLOGW("ByType dhid:%s, isshare:%d", GetAnonyString(device->identifier.descriptor).c_str(), enabled); SaveAffectDhId(enabled, device->identifier.descriptor, affDhIds); } } @@ -988,7 +988,7 @@ AffectDhIds InputHub::SetSharingDevices(bool enabled, std::vector d for (const auto &[id, device] : devices_) { if (device->identifier.descriptor == dhId) { device->isShare = enabled; - DHLOGW("dhid:%s, isshare:%d", device->identifier.descriptor.c_str(), enabled); + DHLOGW("dhid:%s, isshare:%d", GetAnonyString(device->identifier.descriptor).c_str(), enabled); SaveAffectDhId(enabled, device->identifier.descriptor, affDhIds); break; } @@ -1004,7 +1004,7 @@ void InputHub::GetShareMousePathByDhId(std::vector dhIds, std::stri std::unique_lock deviceLock(devicesMutex_); for (auto dhId_ : dhIds) { for (const auto &[id, device] : devices_) { - DHLOGI("descriptor:%s, isShare[%d], type[%d]", device->identifier.descriptor.c_str(), + DHLOGI("descriptor:%s, isShare[%d], type[%d]", GetAnonyString(device->identifier.descriptor).c_str(), device->isShare, device->classes); if ((device->identifier.descriptor == dhId_) && ((device->classes & INPUT_DEVICE_CLASS_CURSOR) != 0)) { diff --git a/common/mock/session_mock.cpp b/common/mock/session_mock.cpp index c1207ce..d179974 100644 --- a/common/mock/session_mock.cpp +++ b/common/mock/session_mock.cpp @@ -30,8 +30,7 @@ static char g_mySessionName[CHAR_ARRAY_SIZE]; int CreateSessionServer(const char *pkgName, const char *sessionName, const ISessionListener *listener) { std::cout << "CreateSessionServer start sessionName:" << sessionName << std::endl; - std::string tmpstr = sessionName; - if (tmpstr.size() <= 0) { + if (strlen(sessionName) <= 0) { std::cout << "CreateSessionServer sessionName is empty." << std::endl; return DH_ERROR; } @@ -39,7 +38,7 @@ int CreateSessionServer(const char *pkgName, const char *sessionName, const ISes std::cout << "CreateSessionServer listener is null." << std::endl; return DH_ERROR; } - if (strcpy_s(g_mySessionName, tmpstr.size(), tmpstr.c_str()) != DH_SUCCESS) { + if (strcpy_s(g_mySessionName, strlen(sessionName) + 1, sessionName) != DH_SUCCESS) { std::cout << "strcpy_s faild" << std::endl; return DH_ERROR; } diff --git a/interfaces/ipc/src/distributed_input_client.cpp b/interfaces/ipc/src/distributed_input_client.cpp index 46b60e6..531aec7 100644 --- a/interfaces/ipc/src/distributed_input_client.cpp +++ b/interfaces/ipc/src/distributed_input_client.cpp @@ -784,8 +784,7 @@ void DistributedInputClient::UpdateSinkScreenInfos(const std::string &strJson) screenTransInfos.clear(); nlohmann::json inputData = nlohmann::json::parse(strJson); size_t jsonSize = inputData.size(); - DHLOGI("OnResult json str: %s, json size:%d.\n", - GetAnonyString(strJson).c_str(), jsonSize); + DHLOGI("OnResult json str: %s, json size:%d.\n", GetAnonyString(strJson).c_str(), jsonSize); std::vector> transInfos = inputData; for (auto info : transInfos) { if (info.size() != SINK_SCREEN_INFO_SIZE) { diff --git a/services/sink/inputcollector/src/distributed_input_collector.cpp b/services/sink/inputcollector/src/distributed_input_collector.cpp index 9416f6f..3d97076 100644 --- a/services/sink/inputcollector/src/distributed_input_collector.cpp +++ b/services/sink/inputcollector/src/distributed_input_collector.cpp @@ -26,6 +26,7 @@ #include #include +#include "anonymous_string.h" #include "distributed_hardware_log.h" #include "nlohmann/json.hpp" @@ -75,8 +76,7 @@ bool DistributedInputCollector::InitCollectEventsThread() collectThreadID_ = -1; int32_t ret = pthread_create(&collectThreadID_, &attr, CollectEventsThread, this); if (ret != 0) { - DHLOGE( - "DistributedInputCollector::InitCollectEventsThread create thread failed:%d \n", ret); + DHLOGE("DistributedInputCollector::InitCollectEventsThread create thread failed:%d \n", ret); pthread_attr_destroy(&attr); collectThreadID_ = -1; isCollectingEvents_ = false; @@ -174,14 +174,14 @@ void DistributedInputCollector::ReportDhIdSharingState(const AffectDhIds &dhIds) } for (auto const &id : dhIds.sharingDhIds) { - DHLOGI("Sharing DhId: %s", id.c_str()); + DHLOGI("Sharing DhId: %s", GetAnonyString(id).c_str()); for (auto iter : sharingDhIdListeners_) { iter->OnSharing(id); } } for (auto const &id : dhIds.noSharingDhIds) { - DHLOGI("No Sharing DhId: %s", id.c_str()); + DHLOGI("No Sharing DhId: %s", GetAnonyString(id).c_str()); for (auto iter : sharingDhIdListeners_) { iter->OnNoSharing(id); } diff --git a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp index d93e35e..1c3b88c 100644 --- a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp +++ b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp @@ -77,8 +77,7 @@ DistributedInputSinkManager::DInputSinkListener::~DInputSinkListener() void DistributedInputSinkManager::DInputSinkListener::onPrepareRemoteInput( const int32_t& sessionId, const std::string &deviceId) { - DHLOGI("onPrepareRemoteInput called, sessionId: %d, devId: %s", - sessionId, GetAnonyString(deviceId).c_str()); + DHLOGI("onPrepareRemoteInput called, sessionId: %d, devId: %s", sessionId, GetAnonyString(deviceId).c_str()); nlohmann::json jsonStr; jsonStr[DINPUT_SOFTBUS_KEY_CMD_TYPE] = TRANS_SINK_MSG_ONPREPARE; @@ -137,8 +136,7 @@ void DistributedInputSinkManager::DInputSinkListener::onStartRemoteInput( const int32_t& sessionId, const uint32_t& inputTypes) { int32_t curSessionId = DistributedInputSinkSwitch::GetInstance().GetSwitchOpenedSession(); - DHLOGI("onStartRemoteInput called, cursessionId: %d, new sessionId: %d", - curSessionId, sessionId); + DHLOGI("onStartRemoteInput called, cursessionId: %d, new sessionId: %d", curSessionId, sessionId); // set new session int32_t startRes = DistributedInputSinkSwitch::GetInstance().StartSwitch(sessionId); @@ -338,7 +336,7 @@ void DistributedInputSinkManager::DInputSinkListener::CheckKeyState(const int32_ // Query all key state rc = ioctl(fd, EVIOCGKEY(sizeof(keystate)), keystate); if (rc < 0) { - DHLOGE("read all key state failed, rc: ", rc); + DHLOGE("read all key state failed, rc=%d ", rc); count += 1; SleepTimeMs(); continue; @@ -371,13 +369,13 @@ bool DistributedInputSinkManager::IsStopDhidOnCmdStillNeed(int32_t sessionId, co } for (auto dhid : sessionDhid.second) { if (stopDhId == dhid) { - DHLOGI("IsStopDhidOnCmdStillNeed stopDhId=%s is find in session: %d", stopDhId.c_str(), + DHLOGI("IsStopDhidOnCmdStillNeed stopDhId=%s is find in session: %d", GetAnonyString(stopDhId).c_str(), sessionDhid.first); return true; } } } - DHLOGW("IsStopDhidOnCmdStillNeed stopDhId=%s is not find.", stopDhId.c_str()); + DHLOGW("IsStopDhidOnCmdStillNeed stopDhId=%s is not find.", GetAnonyString(stopDhId).c_str()); return false; } diff --git a/services/source/sourcemanager/include/distributed_input_source_manager.h b/services/source/sourcemanager/include/distributed_input_source_manager.h index e92e189..c38ed54 100644 --- a/services/source/sourcemanager/include/distributed_input_source_manager.h +++ b/services/source/sourcemanager/include/distributed_input_source_manager.h @@ -37,7 +37,6 @@ #include "distributed_input_source_event_handler.h" #include "distributed_input_source_sa_cli_mgr.h" #include "distributed_input_source_stub.h" -#include "idinput_dbg_itf.h" namespace OHOS { namespace DistributedHardware { @@ -412,10 +411,6 @@ private: std::set GetSyncNodeInfo(const std::string& devId); void UpdateSyncNodeInfo(const std::string& devId, const std::string& dhId, const std::string &nodeDesc); void DeleteSyncNodeInfo(const std::string& devId); - -private: - IDInputDBGItf* dinputDbgItfPtr_ = nullptr; - void InitDinputDBG(); }; } // namespace DistributedInput } // namespace DistributedHardware diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index f9708ec..5820c25 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -43,22 +43,13 @@ #include "distributed_input_source_transport.h" #include "hisysevent_util.h" #include "hidumper.h" -#include "idinput_dbg_itf.h" #include "white_list_util.h" -using GetDInputDBGItfFunc = OHOS::DistributedHardware::DistributedInput::IDInputDBGItf* (*)(); - namespace OHOS { namespace DistributedHardware { namespace DistributedInput { REGISTER_SYSTEM_ABILITY_BY_ID(DistributedInputSourceManager, DISTRIBUTED_HARDWARE_INPUT_SOURCE_SA_ID, true); -#ifdef __LP64__ -const std::string LIB_LOAD_PATH = "/system/lib64/libdinput_dbg_itf.z.so"; -#else -const std::string LIB_LOAD_PATH = "/system/lib/libdinput_dbg_itf.z.so"; -#endif - DistributedInputSourceManager::DistributedInputSourceManager(int32_t saId, bool runOnCreate) : SystemAbility(saId, runOnCreate) { @@ -678,41 +669,9 @@ int32_t DistributedInputSourceManager::Init() dhFwkKit->RegisterPublisherListener(DHTopic::TOPIC_STOP_DSCREEN, stopDScreenListener_); dhFwkKit->RegisterPublisherListener(DHTopic::TOPIC_DEV_OFFLINE, deviceOfflineListener_); - DHLOGI("Try InitDinputDBG"); - InitDinputDBG(); return DH_SUCCESS; } -void DistributedInputSourceManager::InitDinputDBG() -{ - char path[PATH_MAX + 1] = {0x00}; - if (LIB_LOAD_PATH.length() > PATH_MAX || realpath(LIB_LOAD_PATH.c_str(), path) == nullptr) { - DHLOGE("File canonicalization failed"); - return; - } - - void *pHandler = dlopen(path, RTLD_LAZY | RTLD_NODELETE); - if (pHandler == nullptr) { - DHLOGE("%s handler load failed, failed reason : %s", path, dlerror()); - return; - } - - GetDInputDBGItfFunc getDinputDBGItfFunc = (GetDInputDBGItfFunc)dlsym(pHandler, GET_DBG_ITF_FUNC.c_str()); - if (getDinputDBGItfFunc == nullptr) { - DHLOGE("get getDinputDBGItfFunc is null, failed reason : %s", dlerror()); - return; - } - - dinputDbgItfPtr_ = getDinputDBGItfFunc(); - if (dinputDbgItfPtr_ == nullptr) { - DHLOGE("Get DInput DBG iterface error"); - return; - } - - DHLOGE("Init DInput DBG interface"); - dinputDbgItfPtr_->Init(); -} - int32_t DistributedInputSourceManager::Release() { DHLOGI("exit"); @@ -899,7 +858,7 @@ int32_t DistributedInputSourceManager::CheckDeviceIsExists(const std::string &de } if (it == inputDevice_.end()) { - DHLOGE("%s called, deviceId: %s is not exist.", __func__, GetAnonyString(devId).c_str()); + DHLOGE("CheckDevice called, deviceId: %s is not exist.", GetAnonyString(devId).c_str()); if (UnregCallbackNotify(devId, dhId) != DH_SUCCESS) { return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_UNREGISTER_FAIL; } @@ -947,10 +906,10 @@ int32_t DistributedInputSourceManager::UnregisterDistributedHardware(const std:: sptr callback) { HisyseventUtil::GetInstance().SysEventWriteBehavior(DINPUT_UNREGISTER, devId, dhId, "dinput unregister call"); - DHLOGI("%s called, deviceId: %s, dhId: %s", __func__, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("Unregister called, deviceId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (callback == nullptr) { - DHLOGE("%s called, deviceId: %s callback is null.", __func__, GetAnonyString(devId).c_str()); + DHLOGE("Unregister called, deviceId: %s callback is null.", GetAnonyString(devId).c_str()); HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_UNREGISTER_FAIL, devId, dhId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_UNREGISTER_FAIL, "dinput unregister failed in callback is nullptr"); return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_UNREGISTER_FAIL; @@ -991,9 +950,9 @@ int32_t DistributedInputSourceManager::PrepareRemoteInput( { StartAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_PREPARE_START, DINPUT_PREPARE_TASK); HisyseventUtil::GetInstance().SysEventWriteBehavior(DINPUT_PREPARE, deviceId, "dinput prepare call"); - DHLOGI("%s called, deviceId: %s", __func__, GetAnonyString(deviceId).c_str()); + DHLOGI("Prepare called, deviceId: %s", GetAnonyString(deviceId).c_str()); if (callback == nullptr) { - DHLOGE("%s called, deviceId: %s callback is null.", __func__, GetAnonyString(deviceId).c_str()); + DHLOGE("Prepare called, deviceId: %s callback is null.", GetAnonyString(deviceId).c_str()); HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, deviceId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_PREPARE_FAIL, "dinput prepare failed in callback is nullptr"); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_PREPARE_START, DINPUT_PREPARE_TASK); @@ -1045,10 +1004,10 @@ int32_t DistributedInputSourceManager::UnprepareRemoteInput( { StartAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_UNPREPARE_START, DINPUT_UNPREPARE_TASK); HisyseventUtil::GetInstance().SysEventWriteBehavior(DINPUT_UNPREPARE, deviceId, "dinput unprepare call"); - DHLOGI("%s called, deviceId: %s", __func__, GetAnonyString(deviceId).c_str()); + DHLOGI("Unprepare called, deviceId: %s", GetAnonyString(deviceId).c_str()); if (callback == nullptr) { - DHLOGE("%s called, deviceId: %s callback is null.", __func__, GetAnonyString(deviceId).c_str()); + DHLOGE("Unprepare called, deviceId: %s callback is null.", GetAnonyString(deviceId).c_str()); HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, deviceId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_UNPREPARE_FAIL, "dinput unprepare failed in callback is nullptr"); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_UNPREPARE_START, DINPUT_UNPREPARE_TASK); @@ -1094,10 +1053,10 @@ int32_t DistributedInputSourceManager::StartRemoteInput( { StartAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_START_START, DINPUT_START_TASK); HisyseventUtil::GetInstance().SysEventWriteBehavior(DINPUT_START_USE, deviceId, "dinput start use call"); - DHLOGI("%s called, deviceId: %s, inputTypes: %d", __func__, GetAnonyString(deviceId).c_str(), inputTypes); + DHLOGI("Start called, deviceId: %s, inputTypes: %d", GetAnonyString(deviceId).c_str(), inputTypes); if (callback == nullptr) { - DHLOGE("%s called, deviceId: %s callback is null.", __func__, GetAnonyString(deviceId).c_str()); + DHLOGE("Start called, deviceId: %s callback is null.", GetAnonyString(deviceId).c_str()); HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, deviceId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL, "dinput start use failed in callback is nullptr"); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_START_START, DINPUT_START_TASK); @@ -1123,7 +1082,7 @@ int32_t DistributedInputSourceManager::StartRemoteInput( HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, deviceId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL, "dinput start use failed in transport start"); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_START_START, DINPUT_START_TASK); - DHLOGE("%s called, start fail.", __func__); + DHLOGE("Start fail."); for (std::vector::iterator iter = staCallbacks_.begin(); iter != staCallbacks_.end(); iter++) { if (iter->devId == deviceId && iter->inputTypes == inputTypes) { @@ -1143,10 +1102,10 @@ int32_t DistributedInputSourceManager::StopRemoteInput( { StartAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); HisyseventUtil::GetInstance().SysEventWriteBehavior(DINPUT_STOP_USE, deviceId, "dinput stop use call"); - DHLOGI("%s called, deviceId: %s, inputTypes: %d", __func__, GetAnonyString(deviceId).c_str(), inputTypes); + DHLOGI("Stop called, deviceId: %s, inputTypes: %d", GetAnonyString(deviceId).c_str(), inputTypes); if (callback == nullptr) { - DHLOGE("%s called, deviceId: %s callback is null.", __func__, GetAnonyString(deviceId).c_str()); + DHLOGE("Stop called, deviceId: %s callback is null.", GetAnonyString(deviceId).c_str()); HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, deviceId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL, "dinput stop use failed in callback is nullptr"); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); @@ -1168,7 +1127,7 @@ int32_t DistributedInputSourceManager::StopRemoteInput( int32_t ret = DistributedInputSourceTransport::GetInstance().StopRemoteInput(deviceId, inputTypes); if (ret != DH_SUCCESS) { - DHLOGE("%s called, stop fail.", __func__); + DHLOGE("Stop fail."); HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, deviceId, ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL, "dinput stop use failed in transport stop"); FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); @@ -2002,7 +1961,8 @@ void DistributedInputSourceManager::RunStartDhidCallback(const std::string &sink { std::vector dhidsVec; StringSplitToVector(dhIds, INPUT_STRING_SPLIT_POINT, dhidsVec); - DHLOGI("ProcessEvent DINPUT_SOURCE_MANAGER_START_DHID_MSG dhIds:%s, vec-size:%d", dhIds.c_str(), dhidsVec.size()); + DHLOGI("ProcessEvent DINPUT_SOURCE_MANAGER_START_DHID_MSG dhIds:%s, vec-size:%d", GetAnonyString(dhIds).c_str(), + dhidsVec.size()); std::string localNetWorkId = GetLocalNetworkId(); if (localNetWorkId.empty()) { DHLOGE("Could not get local device id."); diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 96a504e..3647781 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -700,7 +700,7 @@ void DistributedInputSourceTransport::CalculateLatency(int32_t sessionId, const void DistributedInputSourceTransport::HandleSessionData(int32_t sessionId, const std::string& message) { if (callback_ == nullptr) { - DHLOGE("OnBytesReceived the callback_ is null, the message:%s abort.", message.c_str()); + DHLOGE("OnBytesReceived the callback_ is null, the message:%s abort.", SetAnonyId(message).c_str()); return; } nlohmann::json recMsg = nlohmann::json::parse(message); @@ -762,8 +762,7 @@ bool DistributedInputSourceTransport::CheckRecivedData(const std::string& messag } if (recMsg.contains(DINPUT_SOFTBUS_KEY_CMD_TYPE) != true) { - DHLOGE("OnBytesReceived message:%s is error, not contain cmdType.", - message.c_str()); + DHLOGE("OnBytesReceived message:%s is error, not contain cmdType.", SetAnonyId(message).c_str()); return false; } @@ -796,7 +795,7 @@ void DistributedInputSourceTransport::OnBytesReceived(int32_t sessionId, const v } std::string message(buf, buf + dataLen); - DHLOGI("OnBytesReceived message:%s.", message.c_str()); + DHLOGI("OnBytesReceived message:%s.", SetAnonyId(message).c_str()); HandleSessionData(sessionId, message); free(buf); diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 8850b89..f221ead 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -93,6 +93,9 @@ std::string SetAnonyId(const std::string &message) if (IsString(jsonObj, DESCRIPTOR)) { jsonObj[DESCRIPTOR] = GetAnonyString(jsonObj[DESCRIPTOR]); } + if (IsString(jsonObj, DINPUT_SOFTBUS_KEY_INPUT_DATA)) { + jsonObj[DINPUT_SOFTBUS_KEY_INPUT_DATA] = GetAnonyString(jsonObj[DINPUT_SOFTBUS_KEY_INPUT_DATA]); + } return jsonObj.dump(); }