From 0b9fc8ee4f022a091626a6ae43ad4e417d5aaf31 Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Fri, 23 Sep 2022 08:51:22 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9Amodify=20wifi=20lnn=20ble=20dis?= =?UTF-8?q?covery=20report=20online?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: YOUR_NAME --- .../include/lnn_distributed_net_ledger.h | 2 +- .../src/lnn_distributed_net_ledger.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/bus_center/lnn/net_ledger/distributed_ledger/include/lnn_distributed_net_ledger.h b/core/bus_center/lnn/net_ledger/distributed_ledger/include/lnn_distributed_net_ledger.h index 658f8e46bc..7ca957e7bb 100644 --- a/core/bus_center/lnn/net_ledger/distributed_ledger/include/lnn_distributed_net_ledger.h +++ b/core/bus_center/lnn/net_ledger/distributed_ledger/include/lnn_distributed_net_ledger.h @@ -70,7 +70,7 @@ int32_t LnnGetLnnRelation(const char *id, IdCategory type, uint8_t *relation, ui int32_t LnnSetDLConnCapability(const char *networkId, uint64_t connCapability); int32_t LnnSetDLNodeAddr(const char *id, IdCategory type, const char *addr); int32_t LnnGetAllAuthSeq(const char *udid, int64_t *authSeq, uint32_t num); -const NodeInfo *LnnGetOnlineNodeByUdidHash(const char *recvUdidHash, DiscoveryType discType); +const NodeInfo *LnnGetOnlineNodeByUdidHash(const char *recvUdidHash); void LnnRefreshDeviceOnlineStateAndDevIdInfo(const char *pkgName, DeviceInfo *device, const InnerDeviceInfoAddtions *addtions); #ifdef __cplusplus diff --git a/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c b/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c index 5fa5a7f42b..20a18adc00 100644 --- a/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c +++ b/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c @@ -1432,7 +1432,7 @@ int32_t LnnInitDistributedLedger(void) return SOFTBUS_OK; } -const NodeInfo *LnnGetOnlineNodeByUdidHash(const char *recvUdidHash, DiscoveryType discType) +const NodeInfo *LnnGetOnlineNodeByUdidHash(const char *recvUdidHash) { int32_t i; int32_t infoNum = 0; @@ -1452,8 +1452,8 @@ const NodeInfo *LnnGetOnlineNodeByUdidHash(const char *recvUdidHash, DiscoveryTy } for (i = 0; i < infoNum; ++i) { const NodeInfo *nodeInfo = LnnGetNodeInfoById(info[i].networkId, CATEGORY_NETWORK_ID); - if (nodeInfo == NULL || !LnnHasDiscoveryType(nodeInfo, discType)) { - SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_INFO, "node online not have discType:%d", discType); + if (nodeInfo == NULL) { + SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_INFO, "nodeInfo is null."); continue; } if (GenerateStrHashAndConvertToHexString((const unsigned char *)nodeInfo->deviceInfo.deviceUdid, @@ -1476,7 +1476,7 @@ static void RefreshDeviceInfoByDevId(DeviceInfo *device, const InnerDeviceInfoAd SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "RefreshDeviceInfoDevId parameter error"); return; } - const NodeInfo *nodeInfo = LnnGetOnlineNodeByUdidHash(device->devId, DISCOVERY_TYPE_BLE); + const NodeInfo *nodeInfo = LnnGetOnlineNodeByUdidHash(device->devId); if (nodeInfo == NULL) { SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "device udidhash:%s is not online", device->devId); return; @@ -1492,7 +1492,7 @@ static void RefreshDeviceOnlineStateInfo(DeviceInfo *device, const InnerDeviceIn device->isOnline = LnnGetOnlineStateById(device->devId, CATEGORY_UDID); } if (addtions->medium == BLE) { - device->isOnline = ((LnnGetOnlineNodeByUdidHash(device->devId, DISCOVERY_TYPE_BLE)) != NULL) ? true : false; + device->isOnline = ((LnnGetOnlineNodeByUdidHash(device->devId)) != NULL) ? true : false; } } @@ -1502,5 +1502,6 @@ void LnnRefreshDeviceOnlineStateAndDevIdInfo(const char *pkgName, DeviceInfo *de (void)pkgName; RefreshDeviceOnlineStateInfo(device, addtions); RefreshDeviceInfoByDevId(device, addtions); - SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_INFO, "device found by medium=%d, online status=%d",addtions->medium, device->isOnline); -} \ No newline at end of file + SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_INFO, "device found by medium=%d, online status=%d", + addtions->medium, device->isOnline); +} -- Gitee From 3ae467724dd7c29776b65fba0f41e1735d3cae1c Mon Sep 17 00:00:00 2001 From: michael4096 Date: Sun, 25 Sep 2022 09:24:51 +0000 Subject: [PATCH 2/2] update core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c. Signed-off-by: michael4096 --- .../distributed_ledger/src/lnn_distributed_net_ledger.c | 1 - 1 file changed, 1 deletion(-) diff --git a/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c b/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c index 7444b29bf4..20a18adc00 100644 --- a/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c +++ b/core/bus_center/lnn/net_ledger/distributed_ledger/src/lnn_distributed_net_ledger.c @@ -1505,4 +1505,3 @@ void LnnRefreshDeviceOnlineStateAndDevIdInfo(const char *pkgName, DeviceInfo *de SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_INFO, "device found by medium=%d, online status=%d", addtions->medium, device->isOnline); } -} -- Gitee