openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2025-02-17 09:37:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!7293 fix：修改发现代码差异

Browse Source 
Merge pull request !7293 from quyihao/master
This commit is contained in:
openharmony_ci 2024-08-26 02:31:56 +00:00 committed by Gitee
commit e03355ae0e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 123 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
adapter/common/net/bluetooth/broadcast/adapter/ble/src/softbus_ble_gatt.c
View File

@ -430,7 +430,7 @@ static int32_t SoftbusUnRegisterScanCb(int32_t scannerId)
SoftBusMutexUnlock(&g_scannerLock);
return SOFTBUS_OK;
}
int ret = BleDeregisterScanCallbacks(g_scanChannel[scannerId].scannerId);
int32_t ret = BleDeregisterScanCallbacks(g_scanChannel[scannerId].scannerId);
DISC_LOGI(DISC_BLE_ADAPTER, "scannerId=%{public}d, bt-scannerId=%{public}d, result=%{public}d",
scannerId, g_scanChannel[scannerId].scannerId, ret);
g_scanChannel[scannerId].scannerId = -1;
@ -454,7 +454,7 @@ static bool CheckAdvChanInUsed(int32_t advId)
return true;
}
static int32_t StartBleAdv(int32_t advId, int *btAdvId, const SoftbusBroadcastParam *param,
static int32_t StartBleAdv(int32_t advId, int32_t *btAdvId, const SoftbusBroadcastParam *param,
const SoftbusBroadcastData *data)
{
BleAdvParams advParam = {};
@ -477,7 +477,7 @@ static int32_t StartBleAdv(int32_t advId, int *btAdvId, const SoftbusBroadcastPa
}
}
DumpSoftbusAdapterData("mgr pkg:", advRawData.advData, advRawData.advDataLen);
int ret = BleStartAdvEx(btAdvId, advRawData, advParam);
int32_t ret = BleStartAdvEx(btAdvId, advRawData, advParam);
SoftBusFree(advRawData.advData);
SoftBusFree(advRawData.rspData);
return (ret == OHOS_BT_STATUS_SUCCESS) ? SOFTBUS_OK : ret;
@ -540,7 +540,7 @@ static int32_t SoftbusStopAdv(int32_t advId)
}
g_advChannel[advId].isAdvertising = false;
SoftBusMutexUnlock(&g_advLock);
int ret = BleStopAdv(btAdvId);
int32_t ret = BleStopAdv(btAdvId);
DISC_LOGI(DISC_BLE_ADAPTER, "advId=%{public}d, bt-advId=%{public}d, ret=%{public}d", advId, btAdvId, ret);
if (ret != OHOS_BT_STATUS_SUCCESS) {
return ret;
@ -656,7 +656,7 @@ static int32_t SoftbusStartScan(int32_t scannerId, const SoftBusBcScanParams *pa
BleScanConfigs scanConfig = {};
scanConfig.scanMode = GetBtScanMode(param->scanInterval, param->scanWindow);
scanConfig.phy = (int)param->scanPhy;
int ret = BleStartScanEx(btScannerId, &scanConfig, nativeFilter, (uint32_t)filterSize);
int32_t ret = BleStartScanEx(btScannerId, &scanConfig, nativeFilter, (uint32_t)filterSize);
FreeBtFilter(nativeFilter, filterSize);
DISC_LOGD(DISC_BLE_ADAPTER, "scannerId=%{public}d, bt-scannerId=%{public}d, ret=%{public}d",
scannerId, btScannerId, ret);
@ -693,7 +693,7 @@ static int32_t SoftbusStopScan(int32_t scannerId)
}
g_scanChannel[scannerId].isScanning = false;
SoftBusMutexUnlock(&g_scannerLock);
int ret = BleStopScan(btScannerId);
int32_t ret = BleStopScan(btScannerId);
DISC_LOGD(DISC_BLE_ADAPTER, "stop scan, scannerId=%{public}d, bt-scannerId=%{public}d, ret=%{public}d",
scannerId, btScannerId, ret);
if (ret != OHOS_BT_STATUS_SUCCESS) {
@ -728,7 +728,7 @@ static int32_t SetBtUuidByBroadCastType(LpServerType type, BtUuid *btUuid)
return SOFTBUS_OK;
}
static void FreeManufactureData(BleScanNativeFilter *nativeFilter, int32_t filterSize)
static void FreeManufactureFilter(BleScanNativeFilter *nativeFilter, int32_t filterSize)
{
while (filterSize-- > 0) {
SoftBusFree((nativeFilter + filterSize)->manufactureData);
@ -777,9 +777,9 @@ static bool SoftbusSetLpParam(LpServerType type,
lpParam.deliveryMode = LP_DELIVERY_MODE_REPLY;
lpParam.advHandle = bcParam->advHandle;
lpParam.duration = LP_ADV_DURATION_MS;
int ret = SetLpDeviceParam(&lpParam);
int32_t ret = SetLpDeviceParam(&lpParam);
if (type == SOFTBUS_HEARTBEAT_TYPE) {
FreeManufactureData(lpParam.filter, scanParam->filterSize);
FreeManufactureFilter(lpParam.filter, scanParam->filterSize);
}
FreeBtFilter(lpParam.filter, scanParam->filterSize);
SoftBusFree(lpParam.rawData.advData);
@ -801,7 +801,7 @@ static int32_t SoftbusGetBroadcastHandle(int32_t advId, int32_t *bcHandle)
}
int32_t btAdvId = g_advChannel[advId].advId;
SoftBusMutexUnlock(&g_advLock);
int ret = GetAdvHandle(btAdvId, bcHandle);
int32_t ret = GetAdvHandle(btAdvId, bcHandle);
if (ret != OHOS_BT_STATUS_SUCCESS) {
DISC_LOGW(DISC_BLE_ADAPTER, "get adv handle failed, advId=%{public}d, bt-advId=%{public}d, ret=%{public}d",
advId, btAdvId, ret);
@ -812,7 +812,7 @@ static int32_t SoftbusGetBroadcastHandle(int32_t advId, int32_t *bcHandle)
static int32_t SoftbusEnableSyncDataToLp(void)
{
int ret = EnableSyncDataToLpDevice();
int32_t ret = EnableSyncDataToLpDevice();
if (ret != OHOS_BT_STATUS_SUCCESS) {
DISC_LOGW(DISC_BLE_ADAPTER, "enable failed, enable sync data to lp, ret=%{public}d", ret);
return ret;
@ -822,7 +822,7 @@ static int32_t SoftbusEnableSyncDataToLp(void)
static int32_t SoftbusDisableSyncDataToLp(void)
{
int ret = DisableSyncDataToLpDevice();
int32_t ret = DisableSyncDataToLpDevice();
if (ret != OHOS_BT_STATUS_SUCCESS) {
DISC_LOGW(DISC_BLE_ADAPTER, "disable failed, disable sync data to lp, ret=%{public}d", ret);
return ret;
@ -843,7 +843,7 @@ static int32_t SoftbusSetScanReportChanToLp(int32_t scannerId, bool enable)
}
int32_t btScannerId = g_scanChannel[scannerId].scannerId;
SoftBusMutexUnlock(&g_scannerLock);
int ret = SetScanReportChannelToLpDevice(btScannerId, enable);
int32_t ret = SetScanReportChannelToLpDevice(btScannerId, enable);
if (ret != OHOS_BT_STATUS_SUCCESS) {
DISC_LOGW(DISC_BLE_ADAPTER, "set channel failed, scannerId=%{public}d, bt-scannerId=%{public}d, ret=%{public}d",
scannerId, btScannerId, ret);
@ -855,7 +855,7 @@ static int32_t SoftbusSetScanReportChanToLp(int32_t scannerId, bool enable)
static int32_t SoftbusSetLpAdvParam(int32_t duration, int32_t maxExtAdvEvents, int32_t window,
int32_t interval, int32_t bcHandle)
{
int ret = SetLpDeviceAdvParam(duration, maxExtAdvEvents, window, interval, bcHandle);
int32_t ret = SetLpDeviceAdvParam(duration, maxExtAdvEvents, window, interval, bcHandle);
if (ret != OHOS_BT_STATUS_SUCCESS) {
DISC_LOGW(DISC_BLE_ADAPTER, "set lp adv param failed, advHandle=%{public}d, ret=%{public}d", bcHandle, ret);
return ret;

2
core/discovery/ble/softbus_ble/include/disc_ble_constant.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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

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

@ -175,7 +175,7 @@ static DiscBleListener g_bleListener = {
.scanListenerId = -1
};
//g_conncernCapabilityMask support capability of this ble discovery
// g_conncernCapabilityMask support capability of this ble discovery
static uint32_t g_concernCapabilityMask =
1 << CASTPLUS_CAPABILITY_BITMAP |
1 << DVKIT_CAPABILITY_BITMAP |
@ -376,7 +376,8 @@ static int32_t ScanFilter(const BroadcastReportInfo *reportInfo)
DISC_CHECK_AND_RETURN_RET_LOGE(reportInfo->dataStatus == SOFTBUS_BC_DATA_COMPLETE,
SOFTBUS_DISCOVER_BLE_REPORT_FILTER_FAIL, DISC_BLE,
"dataStatus is invalid. dataStatus=%{public}u", reportInfo->dataStatus);
DISC_CHECK_AND_RETURN_RET_LOGE(advData != NULL, SOFTBUS_DISCOVER_BLE_REPORT_FILTER_FAIL, DISC_BLE, "advData is null");
DISC_CHECK_AND_RETURN_RET_LOGE(advData != NULL, SOFTBUS_DISCOVER_BLE_REPORT_FILTER_FAIL, DISC_BLE,
"advData is null");
DISC_CHECK_AND_RETURN_RET_LOGE(advLen >= POS_TLV, SOFTBUS_DISCOVER_BLE_REPORT_FILTER_FAIL, DISC_BLE,
"advLen is too short, less than adv header length. advLen=%{public}u", advLen);
@ -561,8 +562,8 @@ static void ProcessDistributePacket(const BroadcastReportInfo *reportInfo)
static void BleScanResultCallback(int listenerId, const BroadcastReportInfo *reportInfo)
{
(void)listenerId;
DISC_CHECK_AND_RETURN_LOGW(listenerId == g_bleListener.scanListenerId, DISC_BLE, "listenerId not match");
DISC_CHECK_AND_RETURN_LOGW(reportInfo != NULL, DISC_BLE, "scan result is null");
DISC_CHECK_AND_RETURN_LOGE(listenerId == g_bleListener.scanListenerId, DISC_BLE, "listenerId not match");
DISC_CHECK_AND_RETURN_LOGE(reportInfo != NULL, DISC_BLE, "scan result is null");
DISC_CHECK_AND_RETURN_LOGD(ScanFilter(reportInfo) == SOFTBUS_OK, DISC_BLE, "scan filter failed");
uint8_t *advData = reportInfo->packet.bcData.payload;
@ -600,11 +601,11 @@ static void BtOnStateChanged(int32_t listenerId, int32_t state)
SoftBusMessage *msg = NULL;
switch (state) {
case SOFTBUS_BLE_STATE_TURN_ON:
DISC_LOGI(DISC_CONTROL, "bt turn on");
DISC_LOGI(DISC_CONTROL, "ble turn on");
msg = CreateBleHandlerMsg(RECOVERY, 0, 0, NULL);
break;
case SOFTBUS_BLE_STATE_TURN_OFF:
DISC_LOGI(DISC_CONTROL, "bt turn off");
DISC_LOGI(DISC_CONTROL, "ble turn off");
msg = CreateBleHandlerMsg(TURN_OFF, 0, 0, NULL);
break;
case SOFTBUS_BR_STATE_TURN_ON:
@ -1839,7 +1840,7 @@ static void DiscBleSetScanFilter(int32_t listenerId, int32_t type)
{
DISC_CHECK_AND_RETURN_LOGW(type != 0, DISC_BLE, "not disc capblity, not set filter");
BcScanFilter *filter = (BcScanFilter *)SoftBusCalloc(sizeof(BcScanFilter));
DISC_CHECK_AND_RETURN_LOGW(filter != NULL, DISC_BLE, "malloc filter failed");
DISC_CHECK_AND_RETURN_LOGE(filter != NULL, DISC_BLE, "malloc filter failed");
filter->serviceData = (uint8_t *)SoftBusCalloc(BLE_SCAN_FILTER_LEN);
filter->serviceDataMask = (uint8_t *)SoftBusCalloc(BLE_SCAN_FILTER_LEN);

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

@ -204,7 +204,7 @@ static NSTACKX_Parameter g_nstackxCallBack = {
int32_t DiscCoapRegisterCb(const DiscInnerCallback *discCoapCb)
{
DISC_CHECK_AND_RETURN_RET_LOGE(discCoapCb != NULL && g_discCoapInnerCb != NULL, SOFTBUS_INVALID_PARAM,
DISC_COAP, "discCoapCb is null");
DISC_COAP, "invalid param");
if (memcpy_s(g_discCoapInnerCb, sizeof(DiscInnerCallback), discCoapCb, sizeof(DiscInnerCallback)) != EOK) {
DISC_LOGE(DISC_COAP, "memcpy_s failed.");
return SOFTBUS_MEM_ERR;
@ -348,7 +348,7 @@ static void FreeDiscSet(NSTACKX_DiscoverySettings *discSet)
int32_t DiscCoapStartDiscovery(DiscCoapOption *option)
{
DISC_CHECK_AND_RETURN_RET_LOGE(option != NULL, SOFTBUS_INVALID_PARAM, DISC_COAP, "option is null");
DISC_CHECK_AND_RETURN_RET_LOGE(option != NULL, SOFTBUS_INVALID_PARAM, DISC_COAP, "option is null.");
DISC_CHECK_AND_RETURN_RET_LOGE(option->mode >= ACTIVE_PUBLISH && option->mode <= ACTIVE_DISCOVERY,
SOFTBUS_INVALID_PARAM, DISC_COAP, "option->mode is invalid");
DISC_CHECK_AND_RETURN_RET_LOGE(LOW <= option->freq && option->freq < FREQ_BUTT, SOFTBUS_INVALID_PARAM,
@ -415,7 +415,7 @@ static int32_t SetLocalDeviceInfo(void)
DISC_CHECK_AND_RETURN_RET_LOGE(g_localDeviceInfo != NULL, SOFTBUS_DISCOVER_COAP_NOT_INIT, DISC_COAP,
"disc coap not init");
int32_t res = memset_s(g_localDeviceInfo, sizeof(NSTACKX_LocalDeviceInfo), 0, sizeof(NSTACKX_LocalDeviceInfo));
DISC_CHECK_AND_RETURN_RET_LOGE(res == EOK, SOFTBUS_MEM_ERR, DISC_COAP, "memset_s local Device Info failed");
DISC_CHECK_AND_RETURN_RET_LOGE(res == EOK, SOFTBUS_MEM_ERR, DISC_COAP, "memset_s local device info failed");
char *deviceIdStr = GetDeviceId();
DISC_CHECK_AND_RETURN_RET_LOGE(deviceIdStr != NULL, SOFTBUS_DISCOVER_COAP_GET_DEVICE_INFO_FAIL, DISC_COAP,

4
core/discovery/ipc/standard/src/disc_client_proxy_standard.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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
@ -95,7 +95,7 @@ void DiscClientProxy::OnPublishSuccess(int publishId)
}
MessageParcel reply;
MessageOption option { MessageOption::TF_ASYNC };
DISC_CHECK_AND_RETURN_LOGE(remote->SendRequest(CLIENT_PUBLISH_SUCC, data, reply, option) == 0,
DISC_CHECK_AND_RETURN_LOGE(remote->SendRequest(CLIENT_PUBLISH_SUCC, data, reply, option) == SOFTBUS_OK,
DISC_CONTROL, "send request failed");
}

4
core/discovery/manager/src/disc_manager.c
View File

@ -132,8 +132,8 @@ static void UpdateDiscEventAndReport(DiscEventExtra *extra, const DeviceInfo *de
}
}
char *deviceType = SoftBusMalloc(DEVICE_TYPE_SIZE_MAX + 1);
DISC_CHECK_AND_RETURN_LOGE(deviceType != NULL, DISC_CONTROL, "SoftBusMalloc failed");
char *deviceType = SoftBusCalloc(DEVICE_TYPE_SIZE_MAX + 1);
DISC_CHECK_AND_RETURN_LOGE(deviceType != NULL, DISC_CONTROL, "SoftBusCalloc failed");
if (snprintf_s(deviceType, DEVICE_TYPE_SIZE_MAX + 1, DEVICE_TYPE_SIZE_MAX, "%03X", device->devType) >= 0) {
extra->peerDeviceType = deviceType;
}

2
sdk/discovery/ipc/mini/disc_server_proxy.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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

45
sdk/discovery/ipc/small/disc_server_proxy.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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
@ -70,13 +70,9 @@ void DiscServerProxyDeInit(void)
int ServerIpcPublishService(const char *pkgName, const PublishInfo *info)
{
DISC_LOGI(DISC_CONTROL, "publish service ipc client push.");
if (pkgName == NULL || info == NULL) {
DISC_LOGE(DISC_SDK, "Invalid param:null");
return SOFTBUS_INVALID_PARAM;
}
if (g_serverProxy == NULL) {
return SOFTBUS_NO_INIT;
}
DISC_CHECK_AND_RETURN_RET_LOGE(pkgName != NULL && info != NULL, SOFTBUS_INVALID_PARAM, DISC_CONTROL,
"Invalid param");
DISC_CHECK_AND_RETURN_RET_LOGE(g_serverProxy != NULL, SOFTBUS_NO_INIT, DISC_CONTROL, "g_serverProxy is null");
uint8_t data[MAX_SOFT_BUS_IPC_LEN] = {0};
IpcIo request = {0};
@ -86,6 +82,7 @@ int ServerIpcPublishService(const char *pkgName, const PublishInfo *info)
DISC_LOGE(DISC_SDK, "Write pkgName failed");
return SOFTBUS_IPC_ERR;
}
DiscSerializer serializer = {
.dataLen = info->dataLen,
.freq = info->freq,
@ -107,6 +104,7 @@ int ServerIpcPublishService(const char *pkgName, const PublishInfo *info)
DISC_LOGE(DISC_SDK, "Write capability failed");
return SOFTBUS_IPC_ERR;
}
if (info->dataLen != 0) {
ret = WriteString(&request, (const char *)(info->capabilityData));
if (!ret) {
@ -126,13 +124,9 @@ int ServerIpcPublishService(const char *pkgName, const PublishInfo *info)
int ServerIpcUnPublishService(const char *pkgName, int publishId)
{
DISC_LOGI(DISC_CONTROL, "unpublish service ipc client push.");
if (pkgName == NULL) {
DISC_LOGE(DISC_SDK, "Invalid param:null");
return SOFTBUS_INVALID_PARAM;
}
if (g_serverProxy == NULL) {
return SOFTBUS_NO_INIT;
}
DISC_CHECK_AND_RETURN_RET_LOGE(pkgName != NULL, SOFTBUS_INVALID_PARAM, DISC_CONTROL,
"Invalid param");
DISC_CHECK_AND_RETURN_RET_LOGE(g_serverProxy != NULL, SOFTBUS_NO_INIT, DISC_CONTROL, "g_serverProxy is null");
uint8_t data[MAX_SOFT_BUS_IPC_LEN] = {0};
IpcIo request = {0};
@ -160,13 +154,10 @@ int ServerIpcUnPublishService(const char *pkgName, int publishId)
int ServerIpcStartDiscovery(const char *pkgName, const SubscribeInfo *info)
{
DISC_LOGI(DISC_CONTROL, "start discovery ipc client push.");
if (pkgName == NULL || info == NULL) {
DISC_LOGE(DISC_SDK, "Invalid param:null");
return SOFTBUS_INVALID_PARAM;
}
if (g_serverProxy == NULL) {
return SOFTBUS_NO_INIT;
}
DISC_CHECK_AND_RETURN_RET_LOGE(pkgName != NULL && info != NULL, SOFTBUS_INVALID_PARAM, DISC_CONTROL,
"Invalid param");
DISC_CHECK_AND_RETURN_RET_LOGE(g_serverProxy != NULL, SOFTBUS_NO_INIT, DISC_CONTROL, "g_serverProxy is null");
uint8_t data[MAX_SOFT_BUS_IPC_LEN] = {0};
IpcIo request = {0};
@ -217,13 +208,9 @@ int ServerIpcStartDiscovery(const char *pkgName, const SubscribeInfo *info)
int ServerIpcStopDiscovery(const char *pkgName, int subscribeId)
{
DISC_LOGI(DISC_SDK, "stop discovery ipc client push.");
if (pkgName == NULL) {
DISC_LOGE(DISC_SDK, "Invalid param:null");
return SOFTBUS_INVALID_PARAM;
}
if (g_serverProxy == NULL) {
return SOFTBUS_NO_INIT;
}
DISC_CHECK_AND_RETURN_RET_LOGE(pkgName != NULL, SOFTBUS_INVALID_PARAM, DISC_CONTROL,
"Invalid param");
DISC_CHECK_AND_RETURN_RET_LOGE(g_serverProxy != NULL, SOFTBUS_NO_INIT, DISC_CONTROL, "g_serverProxy is null");
uint8_t data[MAX_SOFT_BUS_IPC_LEN] = {0};
IpcIo request = {0};

3
sdk/discovery/ipc/standard/src/disc_server_proxy.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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
@ -84,6 +84,7 @@ int32_t DiscServerProxyInit(void)
void DiscServerProxyDeInit(void)
{
DISC_LOGI(DISC_INIT, "enter");
g_serverProxy.clear();
}

177
sdk/discovery/ipc/standard/src/disc_server_proxy_standard.cpp
View File

@ -37,16 +37,17 @@ static sptr<IRemoteObject> GetSystemAbility()
DISC_LOGE(DISC_SDK, "Write inner failed!");
return nullptr;
}
MessageParcel reply;
MessageOption option;
sptr<IRemoteObject> samgr = IPCSkeleton::GetContextObject();
if (samgr == nullptr) {
DISC_LOGE(DISC_SDK, "samgr failed!");
DISC_LOGE(DISC_SDK, "Get samgr failed!");
return nullptr;
}
int32_t err = samgr->SendRequest(g_getSystemAbilityId, data, reply, option);
if (err != 0) {
DISC_LOGE(DISC_SDK, "GetSystemAbility failed!");
DISC_LOGE(DISC_SDK, "Get SystemAbility failed!");
return nullptr;
}
return reply.ReadRemoteObject();
@ -55,52 +56,31 @@ static sptr<IRemoteObject> GetSystemAbility()
int32_t DiscServerProxy::StartDiscovery(const char *pkgName, const SubscribeInfo *subInfo)
{
sptr<IRemoteObject> remote = GetSystemAbility();
if (remote == nullptr) {
DISC_LOGE(DISC_ABILITY, "remote is nullptr!");
return SOFTBUS_DISCOVER_GET_REMOTE_FAILED;
}
DISC_CHECK_AND_RETURN_RET_LOGE(remote != nullptr, SOFTBUS_DISCOVER_GET_REMOTE_FAILED, DISC_ABILITY,
"remote is nullptr!");
MessageParcel data;
if (!data.WriteInterfaceToken(GetDescriptor())) {
DISC_LOGE(DISC_SDK, "StartDiscovery faceToken failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteCString(pkgName)) {
DISC_LOGE(DISC_SDK, "StartDiscovery pkgName failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(subInfo->subscribeId)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo subscribeId failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(subInfo->mode)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo mode failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(subInfo->medium)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo medium failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(subInfo->freq)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo freq failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteBool(subInfo->isSameAccount)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo isSameAccount failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteBool(subInfo->isWakeRemote)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo isWakeRemote failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteCString(subInfo->capability)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo capability failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteUint32(subInfo->dataLen)) {
DISC_LOGE(DISC_SDK, "StartDiscovery subInfo dataLen failed!");
return SOFTBUS_IPC_ERR;
}
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInterfaceToken(GetDescriptor()), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery faceToken failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteCString(pkgName), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery pkgName failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(subInfo->subscribeId), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo subscribeId failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(subInfo->mode), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo mode failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(subInfo->medium), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo medium failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(subInfo->freq), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo freq failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteBool(subInfo->isSameAccount), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo isSameAccount failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteBool(subInfo->isWakeRemote), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo isWakeRemote failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteCString(subInfo->capability), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo capability failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteUint32(subInfo->dataLen), SOFTBUS_IPC_ERR, DISC_SDK,
"StartDiscovery subInfo dataLen failed!");
if (subInfo->dataLen != 0) {
data.WriteCString((char *)subInfo->capabilityData);
}
@ -123,24 +103,16 @@ int32_t DiscServerProxy::StartDiscovery(const char *pkgName, const SubscribeInfo
int32_t DiscServerProxy::StopDiscovery(const char *pkgName, int subscribeId)
{
sptr<IRemoteObject> remote = GetSystemAbility();
if (remote == nullptr) {
DISC_LOGE(DISC_ABILITY, "remote is nullptr!");
return SOFTBUS_DISCOVER_GET_REMOTE_FAILED;
}
DISC_CHECK_AND_RETURN_RET_LOGE(remote != nullptr, SOFTBUS_DISCOVER_GET_REMOTE_FAILED, DISC_ABILITY,
"remote is nullptr!");
MessageParcel data;
if (!data.WriteInterfaceToken(GetDescriptor())) {
DISC_LOGE(DISC_SDK, "StopDiscovery failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteCString(pkgName)) {
DISC_LOGE(DISC_SDK, "StopDiscovery pkgName failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(subscribeId)) {
DISC_LOGE(DISC_SDK, "StopDiscovery subscribeId failed!");
return SOFTBUS_IPC_ERR;
}
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInterfaceToken(GetDescriptor()), SOFTBUS_IPC_ERR, DISC_SDK,
"StopDiscovery failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteCString(pkgName), SOFTBUS_IPC_ERR, DISC_SDK,
"StopDiscovery pkgName failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(subscribeId), SOFTBUS_IPC_ERR, DISC_SDK,
"StopDiscovery subscribeId failed!");
MessageParcel reply;
MessageOption option;
@ -162,44 +134,27 @@ int32_t DiscServerProxy::StopDiscovery(const char *pkgName, int subscribeId)
int32_t DiscServerProxy::PublishService(const char *pkgName, const PublishInfo *pubInfo)
{
sptr<IRemoteObject> remote = GetSystemAbility();
if (remote == nullptr) {
DISC_LOGE(DISC_ABILITY, "remote is nullptr!");
return SOFTBUS_DISCOVER_GET_REMOTE_FAILED;
}
DISC_CHECK_AND_RETURN_RET_LOGE(remote != nullptr, SOFTBUS_DISCOVER_GET_REMOTE_FAILED, DISC_ABILITY,
"remote is nullptr!");
MessageParcel data;
if (!data.WriteInterfaceToken(GetDescriptor())) {
DISC_LOGE(DISC_SDK, "PublishService write InterfaceToken failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteCString(pkgName)) {
DISC_LOGE(DISC_SDK, "PublishService write pkgName failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(pubInfo->publishId)) {
DISC_LOGE(DISC_SDK, "PublishService write publishId failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(pubInfo->mode)) {
DISC_LOGE(DISC_SDK, "PublishService write mode failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(pubInfo->medium)) {
DISC_LOGE(DISC_SDK, "PublishService write medium failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(pubInfo->freq)) {
DISC_LOGE(DISC_SDK, "PublishService write freq failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteCString(pubInfo->capability)) {
DISC_LOGE(DISC_SDK, "PublishService write capability failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteUint32(pubInfo->dataLen)) {
DISC_LOGE(DISC_SDK, "PublishService write dataLen failed!");
return SOFTBUS_IPC_ERR;
}
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInterfaceToken(GetDescriptor()), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write InterfaceToken failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteCString(pkgName), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write pkgName failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(pubInfo->publishId), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write publishId failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(pubInfo->mode), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write mode failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(pubInfo->medium), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write medium failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(pubInfo->freq), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write freq failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteCString(pubInfo->capability), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write capability failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteUint32(pubInfo->dataLen), SOFTBUS_IPC_ERR, DISC_SDK,
"PublishService write dataLen failed!");
if (pubInfo->dataLen != 0) {
data.WriteCString((char *)pubInfo->capabilityData);
}
@ -223,29 +178,21 @@ int32_t DiscServerProxy::PublishService(const char *pkgName, const PublishInfo *
int32_t DiscServerProxy::UnPublishService(const char *pkgName, int publishId)
{
sptr<IRemoteObject> remote = GetSystemAbility();
if (remote == nullptr) {
DISC_LOGE(DISC_ABILITY, "remote is nullptr!");
return SOFTBUS_DISCOVER_GET_REMOTE_FAILED;
}
DISC_CHECK_AND_RETURN_RET_LOGE(remote != nullptr, SOFTBUS_DISCOVER_GET_REMOTE_FAILED, DISC_ABILITY,
"remote is nullptr!");
MessageParcel data;
if (!data.WriteInterfaceToken(GetDescriptor())) {
DISC_LOGE(DISC_SDK, "UnPublishService failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteCString(pkgName)) {
DISC_LOGE(DISC_SDK, "UnPublishService pkgName failed!");
return SOFTBUS_IPC_ERR;
}
if (!data.WriteInt32(publishId)) {
DISC_LOGE(DISC_SDK, "UnPublishService publishId failed!");
return SOFTBUS_IPC_ERR;
}
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInterfaceToken(GetDescriptor()), SOFTBUS_IPC_ERR, DISC_SDK,
"UnPublishService failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteCString(pkgName), SOFTBUS_IPC_ERR, DISC_SDK,
"UnPublishService pkgName failed!");
DISC_CHECK_AND_RETURN_RET_LOGE(data.WriteInt32(publishId), SOFTBUS_IPC_ERR, DISC_SDK,
"UnPublishService publishId failed!");
MessageParcel reply;
MessageOption option;
int32_t err = remote->SendRequest(SERVER_UNPUBLISH_SERVICE, data, reply, option);
DISC_LOGI(DISC_SDK, "UnPublishService send request ret=%{public}d!", err);
DISC_LOGI(DISC_ABILITY, "UnPublishService send request ret=%{public}d!", err);
if (err != 0) {
DISC_LOGE(DISC_SDK, "UnPublishService send request failed!");
return err;

9
sdk/discovery/service/src/client_disc_service.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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
@ -59,6 +59,7 @@ static int32_t PublishInfoCheck(const PublishInfo *info)
DISC_LOGE(DISC_SDK, "data exceeds the maximum length");
return SOFTBUS_INVALID_PARAM;
}
return SOFTBUS_OK;
}
@ -120,7 +121,7 @@ int PublishService(const char *packageName, const PublishInfo *info, const IPubl
{
if ((packageName == NULL) || (strlen(packageName) >= PKG_NAME_SIZE_MAX) || (info == NULL) || (cb == NULL)) {
DfxRecordDiscServerEnd(SERVER_PUBLISH, SOFTBUS_INVALID_PARAM, packageName);
DISC_LOGE(DISC_SDK, "invalid parameter:null");
DISC_LOGE(DISC_SDK, "invalid parameter");
return SOFTBUS_INVALID_PARAM;
}
@ -170,7 +171,7 @@ int StartDiscovery(const char *packageName, const SubscribeInfo *info, const IDi
{
if ((packageName == NULL) || (strlen(packageName) >= PKG_NAME_SIZE_MAX) || (info == NULL) || (cb == NULL)) {
DfxRecordDiscServerEnd(SERVER_DISCOVERY, SOFTBUS_INVALID_PARAM, packageName);
DISC_LOGE(DISC_SDK, " invalid parameter:null");
DISC_LOGE(DISC_SDK, " invalid parameter");
return SOFTBUS_INVALID_PARAM;
}
if (InitSoftBus(packageName) != SOFTBUS_OK) {
@ -198,7 +199,7 @@ int StopDiscovery(const char *packageName, int subscribeId)
{
if ((packageName == NULL) || (strlen(packageName) >= PKG_NAME_SIZE_MAX)) {
DfxRecordDiscServerEnd(SERVER_STOP_DISCOVERY, SOFTBUS_INVALID_PARAM, packageName);
DISC_LOGE(DISC_SDK, "invalid packageName:null");
DISC_LOGE(DISC_SDK, "invalid packageName");
return SOFTBUS_INVALID_PARAM;
}

12
sdk/frame/small/src/disc_client_stub.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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
@ -23,7 +23,7 @@
int32_t ClientOnDiscoverySuccess(IpcIo *data, IpcIo *reply)
{
if (data == NULL) {
DISC_LOGW(DISC_CONTROL, "invalid param.");
DISC_LOGE(DISC_CONTROL, "invalid param.");
return SOFTBUS_INVALID_PARAM;
}
@ -36,7 +36,7 @@ int32_t ClientOnDiscoverySuccess(IpcIo *data, IpcIo *reply)
int32_t ClientOnDiscoverFailed(IpcIo *data, IpcIo *reply)
{
if (data == NULL) {
DISC_LOGW(DISC_CONTROL, "invalid param.");
DISC_LOGE(DISC_CONTROL, "invalid param.");
return SOFTBUS_INVALID_PARAM;
}
@ -51,7 +51,7 @@ int32_t ClientOnDiscoverFailed(IpcIo *data, IpcIo *reply)
int32_t ClientOnDeviceFound(IpcIo *data, IpcIo *reply)
{
if (data == NULL) {
DISC_LOGW(DISC_CONTROL, "invalid param.");
DISC_LOGE(DISC_CONTROL, "invalid param.");
return SOFTBUS_INVALID_PARAM;
}
@ -66,7 +66,7 @@ int32_t ClientOnDeviceFound(IpcIo *data, IpcIo *reply)
int32_t ClientOnPublishSuccess(IpcIo *data, IpcIo *reply)
{
if (data == NULL) {
DISC_LOGW(DISC_CONTROL, "invalid param.");
DISC_LOGE(DISC_CONTROL, "invalid param.");
return SOFTBUS_INVALID_PARAM;
}
@ -79,7 +79,7 @@ int32_t ClientOnPublishSuccess(IpcIo *data, IpcIo *reply)
int32_t ClientOnPublishFail(IpcIo *data, IpcIo *reply)
{
if (data == NULL) {
DISC_LOGW(DISC_CONTROL, "invalid param.");
DISC_LOGE(DISC_CONTROL, "invalid param.");
return SOFTBUS_INVALID_PARAM;
}

1
tests/core/discovery/ble/softbus_ble_mock/ble_mock.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "ble_mock.h"
#include <iostream>
#include <sstream>