From 27a7f2bbefd990576f8f598eb7c72d170ce1476c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 27 Aug 2024 16:56:32 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../include/softbus/softbus_listener.h | 1 + .../service/src/softbus/softbus_listener.cpp | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/services/service/include/softbus/softbus_listener.h b/services/service/include/softbus/softbus_listener.h index 2b53a362..a548ee17 100644 --- a/services/service/include/softbus/softbus_listener.h +++ b/services/service/include/softbus/softbus_listener.h @@ -87,6 +87,7 @@ public: static IRefreshCallback &GetSoftbusRefreshCb(); private: int32_t InitSoftPublishLNN(); + bool IsVaildDeviceInfo(const DeviceInfo *device); private: static bool isRadarSoLoad_; diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index f2ac6cf7..c40e7f5b 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -60,6 +60,7 @@ constexpr static char HEX_ARRAY[] = "0123456789ABCDEF"; constexpr static uint8_t BYTE_MASK = 0x0F; constexpr static uint16_t ARRAY_DOUBLE_SIZE = 2; constexpr static uint16_t BIN_HIGH_FOUR_NUM = 4; +constexpr const char* DEVICE_DM_KEY = "DM"; static PulishStatus g_publishStatus = PulishStatus::STATUS_UNKNOWN; static std::mutex g_deviceMapMutex; @@ -299,7 +300,14 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) LOGE("ReportDiscoverResCallback failed"); } } +#else + if (!IsVaildDeviceInfo(device)) { + LOGE("OnSoftbusDeviceFound: deviceId=%s, extraData=%s", GetAnonyString(dmDevInfo.deviceId).c_str(), + GetAnonyString(device->extraData).c_str); + return; + } #endif + LOGI("OnSoftbusDeviceFound: devId=%s, devName=%s, devType=%d, range=%d, isOnline=%d", GetAnonyString(dmDevInfo.deviceId).c_str(), dmDevInfo.deviceName, dmDevInfo.deviceTypeId, dmDevInfo.range, device->isOnline); @@ -311,6 +319,23 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) } } +bool SoftbusListener::IsVaildDeviceInfo(const DeviceInfo *device) +{ + cJSON *root = cJSON_Parse(device.custData); + if (root == nullptr) { + LOGE("root is nullptr."); + return false; + } + cJSON *object = cJSON_GetObjectItem(root, DEVICE_DM_KEY); + if (object == nullptr || !cJSON_IsString(object)) { + LOGE("object is not string."); + cJSON_Delete(root); + return false; + } + cJSON_Delete(root); + return true; +} + void SoftbusListener::OnSoftbusDiscoveryResult(int subscribeId, RefreshResult result) { uint16_t originId = static_cast((static_cast(subscribeId)) & SOFTBUS_SUBSCRIBE_ID_MASK); -- Gitee From cf748319a35452f5a730a4c2b1ada157fcfbb2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 27 Aug 2024 19:29:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/softbus/softbus_listener.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index c40e7f5b..ae915cb5 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -303,7 +303,7 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) #else if (!IsVaildDeviceInfo(device)) { LOGE("OnSoftbusDeviceFound: deviceId=%s, extraData=%s", GetAnonyString(dmDevInfo.deviceId).c_str(), - GetAnonyString(device->extraData).c_str); + GetAnonyString(dmDevInfo.extraData).c_str); return; } #endif @@ -321,7 +321,7 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) bool SoftbusListener::IsVaildDeviceInfo(const DeviceInfo *device) { - cJSON *root = cJSON_Parse(device.custData); + cJSON *root = cJSON_Parse(device->custData); if (root == nullptr) { LOGE("root is nullptr."); return false; -- Gitee From b928b271cfa54ad2b902d6cbd7a9adc93bbcf33c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 27 Aug 2024 19:53:13 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/include/softbus/softbus_listener.h | 2 +- services/service/src/softbus/softbus_listener.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/service/include/softbus/softbus_listener.h b/services/service/include/softbus/softbus_listener.h index a548ee17..7ea95e13 100644 --- a/services/service/include/softbus/softbus_listener.h +++ b/services/service/include/softbus/softbus_listener.h @@ -87,7 +87,7 @@ public: static IRefreshCallback &GetSoftbusRefreshCb(); private: int32_t InitSoftPublishLNN(); - bool IsVaildDeviceInfo(const DeviceInfo *device); + static bool IsVaildDeviceInfo(const DeviceInfo *device); private: static bool isRadarSoLoad_; diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index ae915cb5..994d5bdf 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -303,7 +303,7 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) #else if (!IsVaildDeviceInfo(device)) { LOGE("OnSoftbusDeviceFound: deviceId=%s, extraData=%s", GetAnonyString(dmDevInfo.deviceId).c_str(), - GetAnonyString(dmDevInfo.extraData).c_str); + GetAnonyString(dmDevInfo.extraData).c_str()); return; } #endif -- Gitee From 09bfcc26f82f64768c49194a866ad86e33c76387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 8 Oct 2024 08:20:17 +0000 Subject: [PATCH 4/8] update services/service/src/softbus/softbus_listener.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/softbus/softbus_listener.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 994d5bdf..c03d9f00 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -302,7 +302,7 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) } #else if (!IsVaildDeviceInfo(device)) { - LOGE("OnSoftbusDeviceFound: deviceId=%s, extraData=%s", GetAnonyString(dmDevInfo.deviceId).c_str(), + LOGE("deviceId=%s, extraData=%s failed.", GetAnonyString(dmDevInfo.deviceId).c_str(), GetAnonyString(dmDevInfo.extraData).c_str()); return; } -- Gitee From 8c64d9481a26145720b9d39153d447d1ff15c35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 8 Oct 2024 08:22:46 +0000 Subject: [PATCH 5/8] update services/service/src/softbus/softbus_listener.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/softbus/softbus_listener.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index c03d9f00..bb6fa8dc 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -302,7 +302,7 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) } #else if (!IsVaildDeviceInfo(device)) { - LOGE("deviceId=%s, extraData=%s failed.", GetAnonyString(dmDevInfo.deviceId).c_str(), + LOGE("Invaild device, deviceId=%s, extraData=%s.", GetAnonyString(dmDevInfo.deviceId).c_str(), GetAnonyString(dmDevInfo.extraData).c_str()); return; } -- Gitee From b21f36b1223db42bc54908e4b8cce282669b67c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 8 Oct 2024 09:29:54 +0000 Subject: [PATCH 6/8] update services/service/include/softbus/softbus_listener.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/include/softbus/softbus_listener.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/service/include/softbus/softbus_listener.h b/services/service/include/softbus/softbus_listener.h index 7ea95e13..10f07733 100644 --- a/services/service/include/softbus/softbus_listener.h +++ b/services/service/include/softbus/softbus_listener.h @@ -87,7 +87,9 @@ public: static IRefreshCallback &GetSoftbusRefreshCb(); private: int32_t InitSoftPublishLNN(); +#ifdef MINE_HARMONY static bool IsVaildDeviceInfo(const DeviceInfo *device); +#endif private: static bool isRadarSoLoad_; -- Gitee From 0d0fea12faaad1db21123db48178caf7bd44781b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 8 Oct 2024 09:30:43 +0000 Subject: [PATCH 7/8] update services/service/src/softbus/softbus_listener.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/softbus/softbus_listener.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index bb6fa8dc..348faf9f 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -60,7 +60,9 @@ constexpr static char HEX_ARRAY[] = "0123456789ABCDEF"; constexpr static uint8_t BYTE_MASK = 0x0F; constexpr static uint16_t ARRAY_DOUBLE_SIZE = 2; constexpr static uint16_t BIN_HIGH_FOUR_NUM = 4; +#ifdef MINE_HARMONY constexpr const char* DEVICE_DM_KEY = "DM"; +#endif static PulishStatus g_publishStatus = PulishStatus::STATUS_UNKNOWN; static std::mutex g_deviceMapMutex; -- Gitee From 06428efb1b1225f136ed4e3fb2ea7dd4bafe22b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 8 Oct 2024 09:32:10 +0000 Subject: [PATCH 8/8] update services/service/src/softbus/softbus_listener.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- services/service/src/softbus/softbus_listener.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/service/src/softbus/softbus_listener.cpp b/services/service/src/softbus/softbus_listener.cpp index 348faf9f..318c90c1 100644 --- a/services/service/src/softbus/softbus_listener.cpp +++ b/services/service/src/softbus/softbus_listener.cpp @@ -321,6 +321,7 @@ void SoftbusListener::OnSoftbusDeviceFound(const DeviceInfo *device) } } +#ifdef MINE_HARMONY bool SoftbusListener::IsVaildDeviceInfo(const DeviceInfo *device) { cJSON *root = cJSON_Parse(device->custData); @@ -337,6 +338,7 @@ bool SoftbusListener::IsVaildDeviceInfo(const DeviceInfo *device) cJSON_Delete(root); return true; } +#endif void SoftbusListener::OnSoftbusDiscoveryResult(int subscribeId, RefreshResult result) { -- Gitee