openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2025-03-01 15:57:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!7350 fix: print anonymized

Browse Source 
Merge pull request !7350 from 张子杰/master
This commit is contained in:
openharmony_ci 2024-08-24 07:27:40 +00:00 committed by Gitee
commit 2466291cd8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/discovery/ble/softbus_ble/src/disc_ble.c
View File

@ -2011,14 +2011,17 @@ static int32_t BleAdvertiserDump(int fd)
SOFTBUS_DPRINTF(fd, "BleAdvertiser channel : %d\n", g_bleAdvertiser[i].channel); SOFTBUS_DPRINTF(fd, "BleAdvertiser channel : %d\n", g_bleAdvertiser[i].channel);
SOFTBUS_DPRINTF(fd, "BleAdvertiser isAdvertising : %d\n", g_bleAdvertiser[i].isAdvertising); SOFTBUS_DPRINTF(fd, "BleAdvertiser isAdvertising : %d\n", g_bleAdvertiser[i].isAdvertising);
SOFTBUS_DPRINTF(fd, "DeviceInfo : \n"); SOFTBUS_DPRINTF(fd, "DeviceInfo : \n");
SOFTBUS_DPRINTF(fd, "devId : %s\n", g_bleAdvertiser[i].deviceInfo.devId); char *anonymizedInfo = NULL;
SOFTBUS_DPRINTF(fd, "accountHash : %s\n", Anonymize(g_bleAdvertiser[i].deviceInfo.devId, &anonymizedInfo);
g_bleAdvertiser[i].deviceInfo.accountHash); SOFTBUS_DPRINTF(fd, "devId : %s\n", AnonymizeWrapper(anonymizedInfo));
AnonymizeFree(anonymizedInfo);
Anonymize(g_bleAdvertiser[i].deviceInfo.accountHash, &anonymizedInfo);
SOFTBUS_DPRINTF(fd, "accountHash : %s\n", AnonymizeWrapper(anonymizedInfo));
AnonymizeFree(anonymizedInfo);
SOFTBUS_DPRINTF(fd, "devType : %u\n", g_bleAdvertiser[i].deviceInfo.devType); SOFTBUS_DPRINTF(fd, "devType : %u\n", g_bleAdvertiser[i].deviceInfo.devType);
char *anonymizedName = NULL; Anonymize(g_bleAdvertiser[i].deviceInfo.devName, &anonymizedInfo);
Anonymize(g_bleAdvertiser[i].deviceInfo.devName, &anonymizedName); SOFTBUS_DPRINTF(fd, "devName : %s\n", AnonymizeWrapper(anonymizedInfo));
SOFTBUS_DPRINTF(fd, "devName : %s\n", AnonymizeWrapper(anonymizedName)); AnonymizeFree(anonymizedInfo);
AnonymizeFree(anonymizedName);
SOFTBUS_DPRINTF(fd, "addrNum : %u\n", g_bleAdvertiser[i].deviceInfo.addrNum); SOFTBUS_DPRINTF(fd, "addrNum : %u\n", g_bleAdvertiser[i].deviceInfo.addrNum);
SOFTBUS_DPRINTF(fd, "addr type : %u\n", SOFTBUS_DPRINTF(fd, "addr type : %u\n",
g_bleAdvertiser[i].deviceInfo.addr[CONNECTION_ADDR_BLE].type); g_bleAdvertiser[i].deviceInfo.addr[CONNECTION_ADDR_BLE].type);

5
core/discovery/coap/nstackx_coap/src/disc_nstackx_adapter.c
View File

@ -166,8 +166,11 @@ static void OnDeviceFound(const NSTACKX_DeviceInfo *deviceList, uint32_t deviceC
} }
if ((nstackxDeviceInfo->update & 0x1) == 0) { if ((nstackxDeviceInfo->update & 0x1) == 0) {
char *anonymizedName = NULL;
Anonymize(nstackxDeviceInfo->deviceName, &anonymizedName);
DISC_LOGI(DISC_COAP, "duplicate device do not need report. deviceName=%{public}s", DISC_LOGI(DISC_COAP, "duplicate device do not need report. deviceName=%{public}s",
nstackxDeviceInfo->deviceName); AnonymizeWrapper(anonymizedName));
AnonymizeFree(anonymizedName);
continue; continue;
} }
(void)memset_s(discDeviceInfo, sizeof(DeviceInfo), 0, sizeof(DeviceInfo)); (void)memset_s(discDeviceInfo, sizeof(DeviceInfo), 0, sizeof(DeviceInfo));