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 658f8e46bc84f8bfcc572ff2198a74251157995a..7ca957e7bb3eeadc1b03c3a83621f531e327a021 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 fb66086f8193c0fe2bedab868d5e378a68bb896f..20a18adc008a9093c228c80742214bb0e7140d7c 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; } } @@ -1504,4 +1504,4 @@ void LnnRefreshDeviceOnlineStateAndDevIdInfo(const char *pkgName, DeviceInfo *de 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 +}