From 4b8178e5b2b97e3dd3e0a348ce77de42ec9fe89d Mon Sep 17 00:00:00 2001 From: baiyuxin Date: Sun, 7 Apr 2024 16:58:58 +0800 Subject: [PATCH] fix: Specification error code and log printing Signed-off-by: baiyuxin --- .../session/src/trans_session_manager.c | 2 +- .../session/src/trans_session_service.c | 6 +- .../auth/src/trans_auth_manager.c | 10 +- .../common/src/trans_lane_pending_ctl.c | 27 ++- .../manager/src/trans_channel_manager.c | 6 +- .../manager/src/trans_lane_manager.c | 12 +- .../proxy/src/softbus_proxychannel_listener.c | 8 +- .../proxy/src/softbus_proxychannel_manager.c | 22 +- .../proxy/src/softbus_proxychannel_message.c | 46 ++--- .../proxy/src/softbus_proxychannel_network.c | 2 +- .../proxy/src/softbus_proxychannel_pipeline.c | 14 +- .../proxy/src/softbus_proxychannel_session.c | 6 +- .../src/softbus_proxychannel_transceiver.c | 10 +- .../src/trans_tcp_direct_listener.c | 4 +- .../tcp_direct/src/trans_tcp_direct_manager.c | 2 +- .../tcp_direct/src/trans_tcp_direct_message.c | 16 +- .../tcp_direct/src/trans_tcp_direct_p2p.c | 18 +- .../src/trans_udp_channel_manager.c | 8 +- .../src/trans_udp_negotiation.c | 10 +- interfaces/kits/common/softbus_error_code.h | 3 + .../common/src/softbus_client_frame_manager.c | 13 +- .../src/client_trans_session_callback.c | 50 ++--- .../src/client_trans_session_manager.c | 195 +++++++++--------- .../src/client_trans_session_service.c | 163 ++++++++------- .../session/src/client_trans_socket_service.c | 8 +- .../src/client_trans_channel_manager.c | 26 +-- .../proxy/src/client_trans_pending.c | 17 +- .../src/client_trans_proxy_file_common.c | 18 +- .../src/client_trans_proxy_file_manager.c | 2 +- .../proxy/src/client_trans_proxy_manager.c | 47 ++--- .../src/client_trans_tcp_direct_listener.c | 16 +- .../src/client_trans_tcp_direct_manager.c | 30 +-- .../src/client_trans_tcp_direct_message.c | 66 +++--- .../udp/common/src/client_trans_udp_manager.c | 52 ++--- .../udp/file/src/client_trans_file.c | 2 +- .../udp/file/src/client_trans_file_listener.c | 16 +- .../src/client_trans_udp_stream_interface.cpp | 4 +- .../udp/stream/adaptor/src/stream_adaptor.cpp | 4 +- .../trans_channel_manager_test.cpp | 4 +- .../trans_lane_manager_test.cpp | 4 +- .../softbus_proxychannel_manager_test.cpp | 2 +- .../softbus_proxychannel_message_test.cpp | 2 +- .../unittest/trans_tcp_direct_p2p_test.cpp | 6 +- .../softbus_client_event_manager_test.cpp | 4 +- .../client_trans_session_callback_test.cpp | 32 +-- .../client_trans_session_manager_test.cpp | 38 ++-- .../client_trans_session_service_test.cpp | 4 +- .../session/client_trans_session_test.cpp | 22 +- .../client_trans_channel_callback_test.cpp | 4 +- .../client_trans_channel_manager_test.cpp | 2 +- .../proxy/client_trans_pending_test.cpp | 2 +- .../client_trans_proxy_file_common_test.cpp | 8 +- .../proxy/client_trans_proxy_manager_test.cpp | 2 +- .../qos/trans_qos_stat_client_test.cpp | 8 +- .../tcp_direct/trans_tcp_direct_test.cpp | 14 +- .../client_trans_udp_manager_static_test.cpp | 12 +- .../common/client_trans_udp_manager_test.cpp | 16 +- 57 files changed, 593 insertions(+), 554 deletions(-) diff --git a/core/transmission/session/src/trans_session_manager.c b/core/transmission/session/src/trans_session_manager.c index 21020d78ec..4f906ce668 100644 --- a/core/transmission/session/src/trans_session_manager.c +++ b/core/transmission/session/src/trans_session_manager.c @@ -255,7 +255,7 @@ int32_t TransGetPkgNameBySessionName(const char *sessionName, char *pkgName, uin (void)SoftBusMutexUnlock(&g_sessionServerList->lock); if (ret != EOK) { TRANS_LOGE(TRANS_CTRL, "strcpy_s error ret, ret=%{public}d", ret); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } diff --git a/core/transmission/session/src/trans_session_service.c b/core/transmission/session/src/trans_session_service.c index 2ef9760e70..7d1fbb142e 100644 --- a/core/transmission/session/src/trans_session_service.c +++ b/core/transmission/session/src/trans_session_service.c @@ -93,15 +93,15 @@ int32_t TransCreateSessionServer(const char *pkgName, const char *sessionName, i AnonymizeFree(tmpName); SessionServer *newNode = (SessionServer *)SoftBusCalloc(sizeof(SessionServer)); if (newNode == NULL) { - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } if (strcpy_s(newNode->pkgName, sizeof(newNode->pkgName), pkgName) != EOK) { SoftBusFree(newNode); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } if (strcpy_s(newNode->sessionName, sizeof(newNode->sessionName), sessionName) != EOK) { SoftBusFree(newNode); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } newNode->type = SEC_TYPE_CIPHERTEXT; newNode->uid = uid; diff --git a/core/transmission/trans_channel/auth/src/trans_auth_manager.c b/core/transmission/trans_channel/auth/src/trans_auth_manager.c index 6a07c17217..6fc5040cd2 100644 --- a/core/transmission/trans_channel/auth/src/trans_auth_manager.c +++ b/core/transmission/trans_channel/auth/src/trans_auth_manager.c @@ -529,11 +529,11 @@ static int32_t GetAppInfo(const char *sessionName, int32_t channelId, AppInfo *a } if (strcpy_s(appInfo->myData.sessionName, sizeof(appInfo->myData.sessionName), sessionName) != EOK) { TRANS_LOGE(TRANS_SVC, "copy sessionName failed"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } appInfo->peerData.apiVersion = API_V2; if (strcpy_s(appInfo->peerData.sessionName, sizeof(appInfo->peerData.sessionName), sessionName) != EOK) { - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } if (TransGetLocalConfig(appInfo->channelType, appInfo->businessType, &appInfo->myData.dataConfig) != SOFTBUS_OK) { return SOFTBUS_ERR; @@ -765,7 +765,7 @@ int32_t TransOpenAuthMsgChannel(const char *sessionName, const ConnectOption *co if (strcpy_s(channel->appInfo.reqId, REQ_ID_SIZE_MAX, reqId) != EOK) { SoftBusFree(channel); TRANS_LOGE(TRANS_SVC, "TransOpenAuthMsgChannel strcpy_s reqId failed"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } if (memcpy_s(&channel->connOpt, sizeof(ConnectOption), connOpt, sizeof(ConnectOption)) != EOK) { SoftBusFree(channel); @@ -887,7 +887,7 @@ int32_t TransAuthGetConnOptionByChanId(int32_t channelId, ConnectOption *connOpt if (memcpy_s(connOpt, sizeof(ConnectOption), &(chanInfo.connOpt), sizeof(ConnectOption)) != EOK) { TRANS_LOGE(TRANS_SVC, "auth channel connopt memcpy fail"); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } return SOFTBUS_OK; } @@ -922,7 +922,7 @@ int32_t TransAuthGetAppInfoByChanId(int32_t channelId, AppInfo *appInfo) if (memcpy_s(appInfo, sizeof(AppInfo), &info->appInfo, sizeof(AppInfo)) != EOK) { (void)SoftBusMutexUnlock(&g_authChannelList->lock); TRANS_LOGE(TRANS_SVC, "auth channel appinfo memcpy fail"); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&g_authChannelList->lock); return SOFTBUS_OK; diff --git a/core/transmission/trans_channel/common/src/trans_lane_pending_ctl.c b/core/transmission/trans_channel/common/src/trans_lane_pending_ctl.c index 703ed2069e..88c9859bd8 100644 --- a/core/transmission/trans_channel/common/src/trans_lane_pending_ctl.c +++ b/core/transmission/trans_channel/common/src/trans_lane_pending_ctl.c @@ -376,7 +376,8 @@ static int32_t TransGetLaneReqItemByLaneReqId(uint32_t laneReqId, bool *bSucc, L *errCode = item->errCode; if (memcpy_s(connInfo, sizeof(LaneConnInfo), &(item->connInfo), sizeof(LaneConnInfo)) != EOK) { (void)SoftBusMutexUnlock(&(g_reqLanePendingList->lock)); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SVC, "memcpy_s connInfo failed"); + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&(g_reqLanePendingList->lock)); return SOFTBUS_OK; @@ -999,7 +1000,7 @@ static int32_t SetP2pConnInfo(const P2pConnInfo *p2pInfo, ConnectOption *connOpt connOpt->type = CONNECT_P2P; if (strcpy_s(connOpt->socketOption.addr, sizeof(connOpt->socketOption.addr), p2pInfo->peerIp) != EOK) { TRANS_LOGE(TRANS_SVC, "set p2p localIp err"); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } connOpt->socketOption.protocol = LNN_PROTOCOL_IP; connOpt->socketOption.port = -1; @@ -1012,7 +1013,7 @@ static int32_t SetP2pReusesConnInfo(const WlanConnInfo *connInfo, ConnectOption connOpt->socketOption.protocol = connInfo->protocol; if (strcpy_s(connOpt->socketOption.addr, sizeof(connOpt->socketOption.addr), connInfo->addr) != EOK) { TRANS_LOGE(TRANS_SVC, "set p2p reuse localIp err"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } @@ -1024,7 +1025,7 @@ static int32_t SetWlanConnInfo(const WlanConnInfo *connInfo, ConnectOption *conn connOpt->socketOption.protocol = connInfo->protocol; if (strcpy_s(connOpt->socketOption.addr, sizeof(connOpt->socketOption.addr), connInfo->addr) != EOK) { TRANS_LOGE(TRANS_SVC, "set wlan localIp err"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } @@ -1032,10 +1033,9 @@ static int32_t SetWlanConnInfo(const WlanConnInfo *connInfo, ConnectOption *conn static int32_t SetBrConnInfo(const BrConnInfo *brInfo, ConnectOption *connOpt) { connOpt->type = CONNECT_BR; - if (strcpy_s(connOpt->brOption.brMac, sizeof(connOpt->brOption.brMac), - brInfo->brMac) != EOK) { + if (strcpy_s(connOpt->brOption.brMac, sizeof(connOpt->brOption.brMac), brInfo->brMac) != EOK) { TRANS_LOGE(TRANS_SVC, "set br mac err"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; @@ -1044,15 +1044,14 @@ static int32_t SetBrConnInfo(const BrConnInfo *brInfo, ConnectOption *connOpt) static int32_t SetBleConnInfo(const BleConnInfo *bleInfo, ConnectOption *connOpt) { connOpt->type = CONNECT_BLE; - if (strcpy_s(connOpt->bleOption.bleMac, sizeof(connOpt->bleOption.bleMac), - bleInfo->bleMac) != EOK) { + if (strcpy_s(connOpt->bleOption.bleMac, sizeof(connOpt->bleOption.bleMac), bleInfo->bleMac) != EOK) { TRANS_LOGE(TRANS_SVC, "set ble mac err"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } if (memcpy_s(connOpt->bleOption.deviceIdHash, sizeof(connOpt->bleOption.deviceIdHash), bleInfo->deviceIdHash, sizeof(bleInfo->deviceIdHash)) != EOK) { - TRANS_LOGE(TRANS_SVC, "set deviceId hash err"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SVC, "memcpy_s deviceId hash err"); + return SOFTBUS_MEM_ERR; } connOpt->bleOption.protocol = bleInfo->protoType; connOpt->bleOption.psm = bleInfo->psm; @@ -1064,7 +1063,7 @@ static int32_t SetBleDirectConnInfo(const BleDirectConnInfo *bleDirect, ConnectO { if (strcpy_s(connOpt->bleDirectOption.networkId, NETWORK_ID_BUF_LEN, bleDirect->networkId) != EOK) { TRANS_LOGW(TRANS_SVC, "set networkId err."); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } connOpt->type = CONNECT_BLE_DIRECT; connOpt->bleDirectOption.protoType = bleDirect->protoType; @@ -1077,7 +1076,7 @@ static int32_t SetHmlConnectInfo(const P2pConnInfo *p2pInfo, ConnectOption *conn connOpt->type = CONNECT_HML; if (strcpy_s(connOpt->socketOption.addr, sizeof(connOpt->socketOption.addr), p2pInfo->peerIp) != EOK) { TRANS_LOGE(TRANS_SVC, "set hml localIp err"); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } connOpt->socketOption.protocol = LNN_PROTOCOL_IP; connOpt->socketOption.port = -1; diff --git a/core/transmission/trans_channel/manager/src/trans_channel_manager.c b/core/transmission/trans_channel/manager/src/trans_channel_manager.c index 72ad75c491..f1c2bffd75 100644 --- a/core/transmission/trans_channel/manager/src/trans_channel_manager.c +++ b/core/transmission/trans_channel/manager/src/trans_channel_manager.c @@ -495,15 +495,15 @@ int32_t TransRippleStats(int32_t channelId, int32_t channelType, const TrafficSt uint32_t laneReqId; int32_t ret = TransGetLaneReqIdByChannelId(channelId, &laneReqId); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_CTRL, "get laneReqId fail, streamStatsInfo cannot be processed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "get laneReqId fail, streamStatsInfo cannot be processed, ret=%{public}d", ret); + return ret; } TRANS_LOGI(TRANS_CTRL, "transRippleStats channelId=%{public}d, laneReqId=0x%{public}x", channelId, laneReqId); LnnRippleData rptdata; (void)memset_s(&rptdata, sizeof(rptdata), 0, sizeof(rptdata)); if (memcpy_s(&rptdata.stats, sizeof(rptdata.stats), data->stats, sizeof(data->stats)) != EOK) { TRANS_LOGE(TRANS_CTRL, "memcpy fail"); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } // modify with laneId uint64_t laneId = INVALID_LANE_ID; diff --git a/core/transmission/trans_channel/manager/src/trans_lane_manager.c b/core/transmission/trans_channel/manager/src/trans_lane_manager.c index 1b9ece8545..5256402afe 100644 --- a/core/transmission/trans_channel/manager/src/trans_lane_manager.c +++ b/core/transmission/trans_channel/manager/src/trans_lane_manager.c @@ -138,13 +138,13 @@ void TransLaneMgrDeinit(void) int32_t TransLaneMgrAddLane(int32_t channelId, int32_t channelType, LaneConnInfo *connInfo, uint32_t laneReqId, AppInfoData *myData) { - if (g_channelLaneList == NULL || connInfo == NULL) { - return SOFTBUS_ERR; + if (g_channelLaneList == NULL || connInfo == NULL || myData == NULL) { + return SOFTBUS_INVALID_PARAM; } TransLaneInfo *newLane = (TransLaneInfo *)SoftBusCalloc(sizeof(TransLaneInfo)); if (newLane == NULL) { - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } newLane->channelId = channelId; newLane->channelType = channelType; @@ -152,12 +152,12 @@ int32_t TransLaneMgrAddLane(int32_t channelId, int32_t channelType, LaneConnInfo newLane->pid = myData->pid; if (memcpy_s(&(newLane->laneConnInfo), sizeof(LaneConnInfo), connInfo, sizeof(LaneConnInfo)) != EOK) { SoftBusFree(newLane); - TRANS_LOGE(TRANS_SVC, "memcpy failed."); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SVC, "memcpy connInfo failed"); + return SOFTBUS_MEM_ERR; } if (strcpy_s(newLane->pkgName, sizeof(newLane->pkgName), myData->pkgName) != EOK) { SoftBusFree(newLane); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } if (SoftBusMutexLock(&(g_channelLaneList->lock)) != 0) { SoftBusFree(newLane); diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_listener.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_listener.c index 868cc5efba..1b6b95e13e 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_listener.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_listener.c @@ -275,11 +275,13 @@ static int32_t TransProxyGetAppInfo(const char *sessionName, const char *peerNet return SOFTBUS_ERR; } if (strcpy_s(appInfo->myData.sessionName, sizeof(appInfo->myData.sessionName), sessionName) != EOK) { - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "strcpy_s my sessionName failed"); + return SOFTBUS_STRCPY_ERR; } appInfo->peerData.apiVersion = API_V2; if (strcpy_s(appInfo->peerData.sessionName, sizeof(appInfo->peerData.sessionName), sessionName) != EOK) { - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "strcpy_s peer sessionName failed"); + return SOFTBUS_STRCPY_ERR; } ret = LnnGetRemoteStrInfo(peerNetworkId, STRING_KEY_UUID, @@ -308,7 +310,7 @@ static int32_t TransGetConnectOption( if (memcpy_s(option.requestInfo.trans.networkId, NETWORK_ID_BUF_LEN, peerNetworkId, NETWORK_ID_BUF_LEN) != EOK) { TRANS_LOGE(TRANS_CTRL, "memcpy networkId failed."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } if (preferred != NULL) { for (uint32_t i = 0; i < preferred->linkTypeNum; i++) { diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_manager.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_manager.c index 25c5e67830..d0ae666cef 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_manager.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_manager.c @@ -617,15 +617,20 @@ int32_t TransProxyGetAuthId(int32_t channelId, AuthHandle *authHandle) int32_t TransProxyGetSessionKeyByChanId(int32_t channelId, char *sessionKey, uint32_t sessionKeySize) { - ProxyChannelInfo *item = NULL; + if (sessionKey == NULL) { + TRANS_LOGE(TRANS_CTRL, "invalid param"); + return SOFTBUS_INVALID_PARAM; + } if (g_proxyChannelList == NULL) { - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "proxy channel list not init"); + return SOFTBUS_NO_INIT; } + ProxyChannelInfo *item = NULL; if (SoftBusMutexLock(&g_proxyChannelList->lock) != 0) { TRANS_LOGE(TRANS_CTRL, "lock mutex fail!"); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } LIST_FOR_EACH_ENTRY(item, &g_proxyChannelList->list, ProxyChannelInfo, node) { @@ -637,14 +642,15 @@ int32_t TransProxyGetSessionKeyByChanId(int32_t channelId, char *sessionKey, uin sizeof(item->appInfo.sessionKey)) != EOK) { TRANS_LOGE(TRANS_CTRL, "memcpy_s fail!"); (void)SoftBusMutexUnlock(&g_proxyChannelList->lock); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&g_proxyChannelList->lock); return SOFTBUS_OK; } } (void)SoftBusMutexUnlock(&g_proxyChannelList->lock); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "not found ChannelInfo by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } static inline void TransProxyProcessErrMsg(ProxyChannelInfo *info, int32_t errCode) @@ -1119,12 +1125,12 @@ void TransProxyProcessHandshakeMsg(const ProxyMessage *msg) (TransProxyAckHandshake(msg->connId, chan, ret) != SOFTBUS_OK)) { TRANS_LOGE(TRANS_CTRL, "ErrHandshake fail, connId=%{public}u.", msg->connId); } - char tmpSocketName[SESSION_NAME_SIZE_MAX] = {0}; + char tmpSocketName[SESSION_NAME_SIZE_MAX] = { 0 }; if (memcpy_s(tmpSocketName, SESSION_NAME_SIZE_MAX, chan->appInfo.myData.sessionName, strlen(chan->appInfo.myData.sessionName)) != EOK) { ReleaseProxyChannelId(chan->channelId); SoftBusFree(chan); - TRANS_LOGE(TRANS_CTRL, "memcpy failed"); + TRANS_LOGE(TRANS_CTRL, "memcpy socketName failed"); return; } NodeInfo nodeInfo; @@ -1699,7 +1705,7 @@ int32_t TransProxyGetNameByChanId(int32_t chanId, char *pkgName, char *sessionNa if (strcpy_s(sessionName, sessionLen, chan->appInfo.myData.sessionName) != EOK) { TRANS_LOGE(TRANS_CTRL, "strcpy_s failed"); SoftBusFree(chan); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } SoftBusFree(chan); return SOFTBUS_OK; diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_message.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_message.c index f355156688..b499f8bdfb 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_message.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_message.c @@ -110,7 +110,7 @@ static int32_t GetRemoteBtMacByUdidHash(const uint8_t *udidHash, uint32_t udidHa static int32_t TransProxyGetAuthConnInfo(uint32_t connId, AuthConnInfo *connInfo) { - ConnectionInfo info = {0}; + ConnectionInfo info = { 0 }; if (ConnGetConnectionInfo(connId, &info) != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "ConnGetConnectionInfo fail, connId=%{public}u", connId); return SOFTBUS_ERR; @@ -119,26 +119,26 @@ static int32_t TransProxyGetAuthConnInfo(uint32_t connId, AuthConnInfo *connInfo case CONNECT_TCP: connInfo->type = AUTH_LINK_TYPE_WIFI; if (strcpy_s(connInfo->info.ipInfo.ip, IP_LEN, info.socketInfo.addr) != EOK) { - TRANS_LOGE(TRANS_CTRL, "copy ip fail."); - return SOFTBUS_MEM_ERR; + TRANS_LOGE(TRANS_CTRL, "strcpy_s ip fail."); + return SOFTBUS_STRCPY_ERR; } break; case CONNECT_BR: connInfo->type = AUTH_LINK_TYPE_BR; if (strcpy_s(connInfo->info.brInfo.brMac, BT_MAC_LEN, info.brInfo.brMac) != EOK) { - TRANS_LOGE(TRANS_CTRL, "copy brMac fail."); - return SOFTBUS_MEM_ERR; + TRANS_LOGE(TRANS_CTRL, "strcpy_s brMac fail."); + return SOFTBUS_STRCPY_ERR; } break; case CONNECT_BLE: connInfo->type = AUTH_LINK_TYPE_BLE; if (strcpy_s(connInfo->info.bleInfo.bleMac, BT_MAC_LEN, info.bleInfo.bleMac) != EOK) { - TRANS_LOGE(TRANS_CTRL, "copy brMac fail."); - return SOFTBUS_MEM_ERR; + TRANS_LOGE(TRANS_CTRL, "strcpy_s brMac fail."); + return SOFTBUS_STRCPY_ERR; } if (memcpy_s(connInfo->info.bleInfo.deviceIdHash, UDID_HASH_LEN, info.bleInfo.deviceIdHash, UDID_HASH_LEN) != EOK) { - TRANS_LOGE(TRANS_CTRL, "copy brMac fail."); + TRANS_LOGE(TRANS_CTRL, "memcpy_s brMac fail."); return SOFTBUS_MEM_ERR; } connInfo->info.bleInfo.protocol = info.bleInfo.protocol; @@ -177,7 +177,7 @@ static int32_t ConvertBleConnInfo2BrConnInfo(AuthConnInfo *connInfo) } if (strcpy_s(connInfo->info.brInfo.brMac, BT_MAC_LEN, brMac) != EOK) { TRANS_LOGE(TRANS_CTRL, "copy br mac fail"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } connInfo->type = AUTH_LINK_TYPE_BR; return SOFTBUS_OK; @@ -222,7 +222,7 @@ int32_t GetBrMacFromConnInfo(uint32_t connId, char *peerBrMac, uint32_t len) } if (strcpy_s(peerBrMac, len, connInfo.info.brInfo.brMac) != EOK) { TRANS_LOGE(TRANS_CTRL, "copy brMac fail."); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } @@ -254,7 +254,7 @@ int32_t TransProxyParseMessage(char *data, int32_t len, ProxyMessage *msg) uint32_t decDataLen = AuthGetDecryptSize((uint32_t)msg->dateLen); uint8_t *decData = (uint8_t *)SoftBusCalloc(decDataLen); if (decData == NULL) { - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } msg->keyIndex = (int32_t)SoftBusLtoHl(*(uint32_t *)msg->data); if (AuthDecrypt(authHandle.authId, (uint8_t *)msg->data, (uint32_t)msg->dateLen, @@ -268,11 +268,11 @@ int32_t TransProxyParseMessage(char *data, int32_t len, ProxyMessage *msg) } else { uint8_t *allocData = (uint8_t *)SoftBusCalloc((uint32_t)msg->dateLen); if (allocData == NULL) { - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } if (memcpy_s(allocData, msg->dateLen, msg->data, msg->dateLen) != EOK) { SoftBusFree(allocData); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } msg->data = (char *)allocData; } @@ -879,11 +879,11 @@ int32_t TransProxyUnpackIdentity(const char *msg, char *identity, uint32_t ident static int32_t TransProxyEncryptFastData(const char *sessionKey, int32_t seq, const char *in, uint32_t inLen, char *out, uint32_t *outLen) { - AesGcmCipherKey cipherKey = {0}; + AesGcmCipherKey cipherKey = { 0 }; cipherKey.keyLen = SESSION_KEY_LENGTH; if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, sessionKey, SESSION_KEY_LENGTH) != EOK) { TRANS_LOGE(TRANS_CTRL, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = SoftBusEncryptDataWithSeq(&cipherKey, (unsigned char*)in, inLen, @@ -891,7 +891,7 @@ static int32_t TransProxyEncryptFastData(const char *sessionKey, int32_t seq, co (void)memset_s(cipherKey.key, SESSION_KEY_LENGTH, 0, SESSION_KEY_LENGTH); if (ret != SOFTBUS_OK || *outLen != inLen + OVERHEAD_LEN) { - TRANS_LOGE(TRANS_CTRL, "encrypt error."); + TRANS_LOGE(TRANS_CTRL, "encrypt error, ret=%{public}d.", ret); return SOFTBUS_ENCRYPT_ERR; } return SOFTBUS_OK; @@ -917,7 +917,7 @@ static int32_t TransProxyPackFastDataHead(ProxyDataInfo *dataInfo, const AppInfo dataInfo->outData = (uint8_t *)SoftBusCalloc(dataInfo->outLen); if (dataInfo->outData == NULL) { TRANS_LOGE(TRANS_CTRL, "calloc error"); - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } int32_t seq = g_proxyPktHeadSeq++; @@ -950,13 +950,13 @@ static int32_t TransProxyMessageData(const AppInfo *appInfo, ProxyDataInfo *data dataInfo->inData = (uint8_t *)SoftBusMalloc(appInfo->fastTransDataSize); if (dataInfo->inData == NULL) { TRANS_LOGE(TRANS_CTRL, "malloc error"); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } uint16_t fastDataSize = appInfo->fastTransDataSize; if (memcpy_s(dataInfo->inData, fastDataSize, appInfo->fastTransData, fastDataSize) != EOK) { - TRANS_LOGE(TRANS_CTRL, "memcpy_s error"); + TRANS_LOGE(TRANS_CTRL, "memcpy_s fastTransData error."); SoftBusFree(dataInfo->inData); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } dataInfo->inLen = fastDataSize; return SOFTBUS_OK; @@ -967,7 +967,7 @@ static int32_t TransProxyByteData(const AppInfo *appInfo, ProxyDataInfo *dataInf dataInfo->inData = (uint8_t *)SoftBusMalloc(appInfo->fastTransDataSize + sizeof(SessionHead)); if (dataInfo->inData == NULL) { TRANS_LOGE(TRANS_CTRL, "malloc error"); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } uint16_t fastDataSize = appInfo->fastTransDataSize; SessionHead *sessionHead = (SessionHead*)dataInfo->inData; @@ -975,9 +975,9 @@ static int32_t TransProxyByteData(const AppInfo *appInfo, ProxyDataInfo *dataInf sessionHead->packetFlag = (appInfo->businessType == BUSINESS_TYPE_BYTE) ? FLAG_BYTES : FLAG_MESSAGE; sessionHead->shouldAck = 0; if (memcpy_s(dataInfo->inData + sizeof(SessionHead), fastDataSize, appInfo->fastTransData, fastDataSize) != EOK) { - TRANS_LOGE(TRANS_CTRL, "memcpy_s error"); + TRANS_LOGE(TRANS_CTRL, "memcpy_s fastTransData error."); SoftBusFree(dataInfo->inData); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } dataInfo->inLen = fastDataSize + sizeof(SessionHead); return SOFTBUS_OK; diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_network.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_network.c index cdfd28c3d8..f6fcafd0aa 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_network.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_network.c @@ -106,7 +106,7 @@ int TransRegisterNetworkingChannelListener(const char *sessionName, const INetwo if (strcpy_s(g_listeners[unuse].sessionName, SESSION_NAME_SIZE_MAX, sessionName) != EOK) { TRANS_LOGE(TRANS_CTRL, "strcpy_s session name failed"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } g_listeners[unuse].listener = *listener; TRANS_LOGI(TRANS_CTRL, "register net listener ok"); diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_pipeline.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_pipeline.c index 18d00d884f..e22095ad58 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_pipeline.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_pipeline.c @@ -189,7 +189,7 @@ int32_t TransProxyPipelineOpenChannel(int32_t requestId, const char *networkId, struct PipelineChannelItem *item = (struct PipelineChannelItem *)SoftBusCalloc(sizeof(struct PipelineChannelItem)); if (item == NULL) { TRANS_LOGE(TRANS_CTRL, "malloc item failed, reqId=%{public}d", requestId); - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } item->requestId = requestId; if (strcpy_s(item->networkId, NETWORK_ID_BUF_LEN, networkId) != EOK) { @@ -205,7 +205,7 @@ int32_t TransProxyPipelineOpenChannel(int32_t requestId, const char *networkId, if (msg == NULL) { TRANS_LOGE(TRANS_CTRL, "malloc msg failed, reqId=%{public}d", requestId); SoftBusFree(item); - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } msg->what = LOOPER_MSG_TYPE_OPEN_CHANNEL; msg->arg1 = requestId; @@ -235,7 +235,7 @@ int32_t TransProxyPipelineSendMessage( TRANS_LOGD(TRANS_CTRL, "enter."); TRANS_CHECK_AND_RETURN_RET_LOGW(data, SOFTBUS_INVALID_PARAM, TRANS_CTRL, "data is invalid"); TRANS_CHECK_AND_RETURN_RET_LOGW(type == MSG_TYPE_P2P_NEGO || type == MSG_TYPE_IP_PORT_EXCHANGE, - SOFTBUS_INVALID_PARAM, TRANS_CTRL, "type is invalid. ype=%{public}d ", type); + SOFTBUS_INVALID_PARAM, TRANS_CTRL, "type is invalid. type=%{public}d ", type); char *sendData = (char *)SoftBusCalloc(dataLen + sizeof(uint32_t)); TRANS_CHECK_AND_RETURN_RET_LOGW(sendData, SOFTBUS_MALLOC_ERR, TRANS_CTRL, "malloc send data failed"); @@ -243,7 +243,7 @@ int32_t TransProxyPipelineSendMessage( if (memcpy_s(sendData + sizeof(uint32_t), dataLen, data, dataLen) != EOK) { TRANS_LOGE(TRANS_CTRL, "memcpy send data failed"); SoftBusFree(sendData); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } if (TransSendNetworkingMessage(channelId, sendData, dataLen + sizeof(uint32_t), CONN_HIGH) != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "trans send data failed"); @@ -331,7 +331,7 @@ int32_t TransProxyPipelineCloseChannelDelay(int32_t channelId) struct SoftBusMessage *msg = (struct SoftBusMessage *)SoftBusCalloc(sizeof(SoftBusMessage)); if (msg == NULL) { TRANS_LOGE(TRANS_CTRL, "malloc msg failed, channelId=%{public}d", channelId); - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } msg->what = LOOPER_MSG_TYPE_DELEY_CLOSE_CHANNEL; msg->arg1 = channelId; @@ -352,7 +352,7 @@ int32_t InnerSaveChannel(int32_t channelId, const char *uuid) struct PipelineChannelItem *item = (struct PipelineChannelItem *)SoftBusCalloc(sizeof(struct PipelineChannelItem)); if (item == NULL) { SoftBusMutexUnlock(&g_manager.channels->lock); - return SOFTBUS_LOCK_ERR; + return SOFTBUS_MALLOC_ERR; } item->channelId = channelId; if (strcpy_s(item->uuid, UUID_BUF_LEN, uuid) != EOK) { @@ -385,7 +385,7 @@ static int TransProxyPipelineOnChannelOpened(int32_t channelId, const char *uuid if (msg == NULL) { TRANS_LOGE(TRANS_CTRL, "malloc msg failed, channelId=%{public}d", channelId); SoftBusFree(clone); - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } msg->what = LOOPER_MSG_TYPE_ON_CHANNEL_OPENED; msg->arg1 = channelId; diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_session.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_session.c index 35b17125de..80a2384c58 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_session.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_session.c @@ -151,19 +151,19 @@ static char *TransProxyPackAppNormalMsg(const ProxyMessageHead *msg, const char return NULL; } if (memcpy_s(&proxyMessageHead, sizeof(ProxyMessageHead), msg, sizeof(ProxyMessageHead)) != EOK) { - TRANS_LOGE(TRANS_MSG, "message copy failed"); + TRANS_LOGE(TRANS_MSG, "memcpy_s message failed."); SoftBusFree(buf); return NULL; } PackProxyMessageHead(&proxyMessageHead); if (memcpy_s(buf + connHeadLen, bufLen - connHeadLen, &proxyMessageHead, sizeof(ProxyMessageHead)) != EOK) { - TRANS_LOGE(TRANS_MSG, "buf copy failed"); + TRANS_LOGE(TRANS_MSG, "memcpy_s buf failed."); SoftBusFree(buf); return NULL; } dstLen = bufLen - connHeadLen - sizeof(ProxyMessageHead); if (memcpy_s(buf + connHeadLen + sizeof(ProxyMessageHead), dstLen, payLoad, datalen) != EOK) { - TRANS_LOGE(TRANS_MSG, "buf copy failed"); + TRANS_LOGE(TRANS_MSG, "memcpy_s buf failed."); SoftBusFree(buf); return NULL; } diff --git a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_transceiver.c b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_transceiver.c index dcc60756f4..1fff22263d 100644 --- a/core/transmission/trans_channel/proxy/src/softbus_proxychannel_transceiver.c +++ b/core/transmission/trans_channel/proxy/src/softbus_proxychannel_transceiver.c @@ -917,7 +917,7 @@ int32_t TransProxyGetConnInfoByConnId(uint32_t connId, ConnectOption *connInfo) { if (connInfo == NULL) { TRANS_LOGW(TRANS_CTRL, "invalid param."); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } if (g_proxyConnectionList == NULL) { @@ -927,16 +927,16 @@ int32_t TransProxyGetConnInfoByConnId(uint32_t connId, ConnectOption *connInfo) if (SoftBusMutexLock(&g_proxyConnectionList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "lock mutex fail."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ProxyConnInfo *item = NULL; LIST_FOR_EACH_ENTRY(item, &g_proxyConnectionList->list, ProxyConnInfo, node) { if (item->connId == connId) { if (memcpy_s(connInfo, sizeof(ConnectOption), &(item->connInfo), sizeof(ConnectOption)) != EOK) { - TRANS_LOGE(TRANS_CTRL, "proxy connoption memcpy failed. connId=%{public}u", connId); + TRANS_LOGE(TRANS_CTRL, "memcpy_s connInfo failed. connId=%{public}u", connId); (void)SoftBusMutexUnlock(&g_proxyConnectionList->lock); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&g_proxyConnectionList->lock); return SOFTBUS_OK; @@ -944,6 +944,6 @@ int32_t TransProxyGetConnInfoByConnId(uint32_t connId, ConnectOption *connInfo) } (void)SoftBusMutexUnlock(&g_proxyConnectionList->lock); TRANS_LOGE(TRANS_INIT, "proxy conn node not found. connId=%{public}u", connId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } diff --git a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_listener.c b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_listener.c index 705ed19980..e34771eede 100644 --- a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_listener.c +++ b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_listener.c @@ -173,7 +173,7 @@ static int32_t CreateSessionConnNode(ListenerModule module, int fd, int32_t chan EOK) { TRANS_LOGE(TRANS_CTRL, "copy ip to app info failed."); SoftBusFree(conn); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } conn->appInfo.protocol = clientAddr->socketOption.protocol; @@ -181,7 +181,7 @@ static int32_t CreateSessionConnNode(ListenerModule module, int fd, int32_t chan if (strcpy_s(conn->appInfo.myData.authState, sizeof(conn->appInfo.myData.authState), authState) != EOK) { TRANS_LOGE(TRANS_CTRL, "copy auth state to app info failed."); SoftBusFree(conn); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } if (TransTdcAddSessionConn(conn) != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "add session conn node failed."); diff --git a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c index 7a28369e42..168be2b62a 100644 --- a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c +++ b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_manager.c @@ -244,7 +244,7 @@ static int32_t TransUpdAppInfo(AppInfo *appInfo, const ConnectOption *connInfo) appInfo->peerData.port = connInfo->socketOption.port; if (strcpy_s(appInfo->peerData.addr, sizeof(appInfo->peerData.addr), connInfo->socketOption.addr) != EOK) { TRANS_LOGE(TRANS_CTRL, "TransUpdAppInfo cpy fail"); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } appInfo->routeType = connInfo->type == CONNECT_TCP ? WIFI_STA : WIFI_P2P; appInfo->protocol = connInfo->socketOption.protocol; diff --git a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_message.c b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_message.c index fb42cf98a6..a1833bef9c 100644 --- a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_message.c +++ b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_message.c @@ -232,7 +232,7 @@ static int32_t PackBytes(int32_t channelId, const char *data, TdcPacketHead *pac PackTdcPacketHead(packetHead); if (memcpy_s(buffer, bufLen, packetHead, sizeof(TdcPacketHead)) != EOK) { - TRANS_LOGE(TRANS_BYTES, "buffer copy fail"); + TRANS_LOGE(TRANS_BYTES, "memcpy_s buffer fail"); return SOFTBUS_MEM_ERR; } return SOFTBUS_OK; @@ -356,7 +356,7 @@ static int32_t GetServerSideIpInfo(SessionConn *conn, char *ip, uint32_t len) } if (strcpy_s(ip, len, myIp)) { TRANS_LOGE(TRANS_CTRL, "copy str failed"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } @@ -399,7 +399,7 @@ static int32_t GetClientSideIpInfo(SessionConn *conn, char *ip, uint32_t len) } if (strcpy_s(ip, len, conn->appInfo.myData.addr)) { TRANS_LOGE(TRANS_CTRL, "copy str failed"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } @@ -976,7 +976,7 @@ static int64_t GetAuthIdByChannelInfo(int32_t channelId, uint64_t seq, uint32_t { int64_t authId = GetAuthIdByChanId(channelId); if (authId != AUTH_INVALID_ID) { - TRANS_LOGI(TRANS_CTRL, "authId is not AUTH_INVALID_ID"); + TRANS_LOGI(TRANS_CTRL, "authId=%{public}" PRId64 " is not AUTH_INVALID_ID", authId); return authId; } AppInfo appInfo; @@ -1165,7 +1165,7 @@ static int32_t TransTdcUpdateDataBufWInfo(int32_t channelId, char *recvBuf, int3 { if (recvBuf == NULL) { TRANS_LOGW(TRANS_CTRL, "invalid param."); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } if (g_tcpSrvDataList == NULL) { TRANS_LOGE(TRANS_CTRL, "srv data list empty."); @@ -1173,7 +1173,7 @@ static int32_t TransTdcUpdateDataBufWInfo(int32_t channelId, char *recvBuf, int3 } if (SoftBusMutexLock(&g_tcpSrvDataList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ServerDataBuf *item = NULL; ServerDataBuf *nextItem = NULL; @@ -1190,8 +1190,8 @@ static int32_t TransTdcUpdateDataBufWInfo(int32_t channelId, char *recvBuf, int3 } if (memcpy_s(item->w, recvLen, recvBuf, recvLen) != EOK) { (void)SoftBusMutexUnlock(&g_tcpSrvDataList->lock); - TRANS_LOGE(TRANS_CTRL, "trans tdc memcpy failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "memcpy_s trans tdc failed. channelId=%{public}d", channelId); + return SOFTBUS_MEM_ERR; } item->w += recvLen; (void)SoftBusMutexUnlock(&g_tcpSrvDataList->lock); diff --git a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_p2p.c b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_p2p.c index bbaba73d3a..ce8e5f91dd 100644 --- a/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_p2p.c +++ b/core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_p2p.c @@ -60,7 +60,7 @@ static int32_t StartNewP2pListener(const char *ip, int32_t *port) if (strcpy_s(info.socketOption.addr, sizeof(info.socketOption.addr), ip) != EOK) { TRANS_LOGE(TRANS_CTRL, "copy addr failed!"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } listenerPort = TransTdcStartSessionListener(DIRECT_CHANNEL_SERVER_P2P, &info); @@ -83,7 +83,7 @@ static int32_t StartNewHmlListener(const char *ip, int32_t *port, ListenerModule info.socketOption.protocol = LNN_PROTOCOL_IP; if (strcpy_s(info.socketOption.addr, sizeof(info.socketOption.addr), ip) != EOK) { TRANS_LOGE(TRANS_CTRL, "copy addr failed!"); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } for (int32_t i = DIRECT_CHANNEL_SERVER_HML_START; i <= DIRECT_CHANNEL_SERVER_HML_END; i++) { info.socketOption.moduleId = (ListenerModule)i; @@ -244,7 +244,7 @@ static int32_t StartHmlListener(const char *ip, int32_t *port) StopHmlListener(moudleType); (void)SoftBusMutexUnlock(&g_hmlListenerList->lock); TRANS_LOGE(TRANS_CTRL, "HmlListenerInfo malloc fail"); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } item->myPort = *port; item->moudleType = moudleType; @@ -298,7 +298,7 @@ static int32_t StartP2pListener(const char *ip, int32_t *port) TRANS_LOGE(TRANS_CTRL, "strcpy_s fail"); StopP2pSessionListener(); (void)SoftBusMutexUnlock(&g_p2pLock); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } (void)SoftBusMutexUnlock(&g_p2pLock); TRANS_LOGI(TRANS_CTRL, "end: port=%{public}d", *port); @@ -484,13 +484,13 @@ static int32_t SendVerifyP2pRsp(AuthHandle authHandle, int32_t module, int32_t f char *sendMsg = (char*)SoftBusCalloc(strLen + sizeof(int64_t) + sizeof(int64_t)); if (sendMsg == NULL) { TRANS_LOGE(TRANS_CTRL, "softbuscalloc fail"); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } *(int64_t*)sendMsg = P2P_VERIFY_REPLY; *(int64_t*)(sendMsg + sizeof(int64_t)) = seq; if (strcpy_s(sendMsg + sizeof(int64_t) + sizeof(int64_t), strLen, reply) != EOK) { SoftBusFree(sendMsg); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } ret = TransProxyPipelineSendMessage(authHandle.authId, (uint8_t *)sendMsg, strLen + sizeof(int64_t) + sizeof(int64_t), MSG_TYPE_IP_PORT_EXCHANGE); @@ -574,7 +574,7 @@ static int32_t ConnectTcpDirectPeer(const char *addr, int port) int32_t ret = strcpy_s(options.socketOption.addr, sizeof(options.socketOption.addr), addr); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "strcpy_s failed! ret=%{public}" PRId32, ret); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return ConnOpenClientSocket(&options, BIND_ADDR_ALL, true); @@ -824,14 +824,14 @@ static int32_t StartVerifyP2pInfo(const AppInfo *appInfo, SessionConn *conn) char *sendMsg = (char*)SoftBusCalloc(strLen + sizeof(int64_t) + sizeof(int64_t)); if (sendMsg == NULL) { cJSON_free(msg); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } *(int64_t*)sendMsg = P2P_VERIFY_REQUEST; *(int64_t*)(sendMsg + sizeof(int64_t)) = conn->req; if (strcpy_s(sendMsg + sizeof(int64_t) + sizeof(int64_t), strLen, msg) != EOK) { cJSON_free(msg); SoftBusFree(sendMsg); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } ret = TransProxyPipelineSendMessage(pipeLineChannelId, (uint8_t *)sendMsg, strLen + sizeof(int64_t) + sizeof(int64_t), MSG_TYPE_IP_PORT_EXCHANGE); diff --git a/core/transmission/trans_channel/udp_negotiation/src/trans_udp_channel_manager.c b/core/transmission/trans_channel/udp_negotiation/src/trans_udp_channel_manager.c index 31bbb3eb13..c680626140 100644 --- a/core/transmission/trans_channel/udp_negotiation/src/trans_udp_channel_manager.c +++ b/core/transmission/trans_channel/udp_negotiation/src/trans_udp_channel_manager.c @@ -272,7 +272,7 @@ int32_t TransGetUdpChannelBySeq(int64_t seq, UdpChannelInfo *channel) LIST_FOR_EACH_ENTRY(udpChannelNode, &(g_udpChannelMgr->list), UdpChannelInfo, node) { if (udpChannelNode->seq == seq) { if (memcpy_s(channel, sizeof(UdpChannelInfo), udpChannelNode, sizeof(UdpChannelInfo)) != EOK) { - TRANS_LOGE(TRANS_CTRL, "memcpy_s failed."); + TRANS_LOGE(TRANS_CTRL, "memcpy_s UdpChannelInfo failed."); (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); return SOFTBUS_MEM_ERR; } @@ -306,7 +306,7 @@ int32_t TransGetUdpChannelById(int32_t channelId, UdpChannelInfo *channel) LIST_FOR_EACH_ENTRY(udpChannelNode, &(g_udpChannelMgr->list), UdpChannelInfo, node) { if (udpChannelNode->info.myData.channelId == channelId) { if (memcpy_s(channel, sizeof(UdpChannelInfo), udpChannelNode, sizeof(UdpChannelInfo)) != EOK) { - TRANS_LOGE(TRANS_CTRL, "memcpy_s failed."); + TRANS_LOGE(TRANS_CTRL, "memcpy_s UdpChannelInfo failed."); (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); return SOFTBUS_MEM_ERR; } @@ -342,7 +342,7 @@ int32_t TransUdpGetNameByChanId(int32_t channelId, char *pkgName, char *sessionN strcpy_s(sessionName, sessionNameLen, udpChannelNode->info.myData.sessionName) != EOK) { TRANS_LOGE(TRANS_CTRL, "strcpy_s failed."); (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); return SOFTBUS_OK; @@ -424,7 +424,7 @@ void TransUpdateUdpChannelInfo(int64_t seq, const AppInfo *appInfo) LIST_FOR_EACH_ENTRY(udpChannelNode, &(g_udpChannelMgr->list), UdpChannelInfo, node) { if (udpChannelNode->seq == seq) { if (memcpy_s(&(udpChannelNode->info), sizeof(AppInfo), appInfo, sizeof(AppInfo)) != EOK) { - TRANS_LOGE(TRANS_CTRL, "memcpy_s failed."); + TRANS_LOGE(TRANS_CTRL, "memcpy_s UdpChannelInfo failed."); } (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); return; diff --git a/core/transmission/trans_channel/udp_negotiation/src/trans_udp_negotiation.c b/core/transmission/trans_channel/udp_negotiation/src/trans_udp_negotiation.c index 35d7e7fee8..b78e48b23b 100644 --- a/core/transmission/trans_channel/udp_negotiation/src/trans_udp_negotiation.c +++ b/core/transmission/trans_channel/udp_negotiation/src/trans_udp_negotiation.c @@ -425,11 +425,11 @@ static int32_t SendReplyUdpInfo(AppInfo *appInfo, AuthHandle authHandle, int64_t static int32_t SetPeerDeviceIdByAuth(AuthHandle authHandle, AppInfo *appInfo) { - char peerUuid[UUID_BUF_LEN] = {0}; + char peerUuid[UUID_BUF_LEN] = { 0 }; int32_t ret = AuthGetDeviceUuid(authHandle.authId, peerUuid, sizeof(peerUuid)); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_CTRL, "get peer uuid by auth id failed, ret=%{public}d.", ret); - return SOFTBUS_ERR; + return ret; } if (memcpy_s(appInfo->peerData.deviceId, sizeof(appInfo->peerData.deviceId), @@ -497,8 +497,8 @@ static int32_t ParseRequestAppInfo(AuthHandle authHandle, const cJSON *msg, AppI } } if (strcpy_s(appInfo->myData.addr, sizeof(appInfo->myData.addr), localIp) != EOK) { - TRANS_LOGE(TRANS_CTRL, "strcpy_s failed."); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_CTRL, "strcpy_s my ip addr failed."); + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; @@ -882,7 +882,7 @@ static int32_t PrepareAppInfoForUdpOpen(const ConnectOption *connOpt, AppInfo *a { appInfo->peerData.port = connOpt->socketOption.port; if (strcpy_s(appInfo->peerData.addr, sizeof(appInfo->peerData.addr), connOpt->socketOption.addr) != EOK) { - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } if (SoftBusGenerateSessionKey(appInfo->sessionKey, sizeof(appInfo->sessionKey)) != SOFTBUS_OK) { diff --git a/interfaces/kits/common/softbus_error_code.h b/interfaces/kits/common/softbus_error_code.h index 84c81ad806..d89918319a 100644 --- a/interfaces/kits/common/softbus_error_code.h +++ b/interfaces/kits/common/softbus_error_code.h @@ -238,6 +238,9 @@ enum SoftBusErrNo { SOFTBUS_TRANS_MSG_BUILD_PAYLOAD_FAIL, // build broadcast payload fail SOFTBUS_TRANS_MSG_INIT_FAIL, // notification message init fail SOFTBUS_TRANS_MSG_REPLACE_PAYLOAD_FAIL, // replace payload without stopping the broadcast fail + SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND, + SOFTBUS_TRANS_TDC_CHANNEL_ALREADY_EXIST, // receive repeat tdc channel open request + SOFTBUS_TRANS_UDP_SET_CHANNEL_FAILED, /* errno begin: -((203 << 21) | (3 << 16) | 0xFFFF) */ SOFTBUS_AUTH_ERR_BASE = SOFTBUS_ERRNO(AUTH_SUB_MODULE_CODE), diff --git a/sdk/frame/common/src/softbus_client_frame_manager.c b/sdk/frame/common/src/softbus_client_frame_manager.c index 4250168231..43ca92fd5d 100644 --- a/sdk/frame/common/src/softbus_client_frame_manager.c +++ b/sdk/frame/common/src/softbus_client_frame_manager.c @@ -66,7 +66,7 @@ static int32_t AddClientPkgName(const char *pkgName) { if (!CheckPkgNameInfo(pkgName)) { COMM_LOGE(COMM_SDK, "check PkgNameInfo invalid."); - return SOFTBUS_INVALID_PARAM; + return SOFTBUS_INVALID_PKGNAME; } if (SoftBusMutexLock(&g_pkgNameLock) != SOFTBUS_OK) { COMM_LOGE(COMM_SDK, "lock init failed"); @@ -79,10 +79,10 @@ static int32_t AddClientPkgName(const char *pkgName) return SOFTBUS_MALLOC_ERR; } if (strcpy_s(info->pkgName, PKG_NAME_SIZE_MAX, pkgName) != EOK) { - COMM_LOGE(COMM_SDK, "Add strcpy_s failed."); + COMM_LOGE(COMM_SDK, "strcpy_s pkgName failed."); SoftBusFree(info); SoftBusMutexUnlock(&g_pkgNameLock); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } ListInit(&info->node); ListAdd(&g_pkgNameList, &info->node); @@ -216,7 +216,7 @@ int32_t InitSoftBus(const char *pkgName) { if (!IsValidString(pkgName, PKG_NAME_SIZE_MAX - 1)) { COMM_LOGE(COMM_SDK, "init softbus sdk fail. Package name is empty or length exceeds"); - return SOFTBUS_INVALID_PARAM; + return SOFTBUS_INVALID_PKGNAME; } if (SoftBusMutexInit(&g_pkgNameLock, NULL) != SOFTBUS_OK) { COMM_LOGE(COMM_SDK, "lock init pkgName failed"); @@ -238,7 +238,7 @@ int32_t InitSoftBus(const char *pkgName) if (AddClientPkgName(pkgName) != SOFTBUS_OK) { SoftBusMutexUnlock(&g_isInitedLock); COMM_LOGE(COMM_SDK, "AddClientPkgName failed."); - return SOFTBUS_MEM_ERR; + return SOFTBUS_INVALID_PKGNAME; } if (SoftBusTimerInit() != SOFTBUS_OK) { COMM_LOGE(COMM_SDK, "client timer init fail"); @@ -252,6 +252,7 @@ int32_t InitSoftBus(const char *pkgName) COMM_LOGE(COMM_SDK, "service init fail"); goto EXIT; } + if (ClientRegisterService(pkgName) != SOFTBUS_OK) { COMM_LOGE(COMM_SDK, "ClientRegisterService fail"); goto EXIT; @@ -263,7 +264,7 @@ int32_t InitSoftBus(const char *pkgName) EXIT: FreeClientPkgName(); SoftBusMutexUnlock(&g_isInitedLock); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } uint32_t GetSoftBusClientNameList(char *pkgList[], uint32_t len) diff --git a/sdk/transmission/session/src/client_trans_session_callback.c b/sdk/transmission/session/src/client_trans_session_callback.c index c794475ed6..0015a65902 100644 --- a/sdk/transmission/session/src/client_trans_session_callback.c +++ b/sdk/transmission/session/src/client_trans_session_callback.c @@ -57,14 +57,14 @@ static int32_t AcceptSessionAsServer(const char *sessionName, const ChannelInfo strcpy_s(session->info.groupId, GROUP_ID_SIZE_MAX, channel->groupId) != EOK) { TRANS_LOGE(TRANS_SDK, "client or peer session name, device id, group id failed"); SoftBusFree(session); - return SOFTBUS_MEM_ERR; + return SOFTBUS_STRCPY_ERR; } int32_t ret = ClientAddNewSession(sessionName, session); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "client add session failed"); + TRANS_LOGE(TRANS_SDK, "client add session failed, ret=%{public}d", ret); SoftBusFree(session); - return SOFTBUS_ERR; + return ret; } *sessionId = session->sessionId; TRANS_LOGE(TRANS_SDK, "ok"); @@ -80,13 +80,13 @@ static int32_t GetSessionCallbackByChannelId(int32_t channelId, int32_t channelT } int32_t ret = ClientGetSessionIdByChannelId(channelId, channelType, sessionId); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get sessionId failed, channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "get sessionId failed, channelId=%{public}d, ret=%{public}d", channelId, ret); + return ret; } ret = ClientGetSessionCallbackById(*sessionId, listener); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get session listener failed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "get session listener failed, ret=%{public}d", ret); + return ret; } return SOFTBUS_OK; } @@ -101,13 +101,13 @@ static int32_t GetSocketCallbackAdapterByChannelId(int32_t channelId, int32_t ch int32_t ret = ClientGetSessionIdByChannelId(channelId, channelType, sessionId); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get sessionId failed, channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "get sessionId failed, channelId=%{public}d, ret=%{public}d", channelId, ret); + return ret; } ret = ClientGetSessionCallbackAdapterById(*sessionId, sessionCallback, isServer); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get socket callback failed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "get socket callback failed, ret=%{public}d", ret); + return ret; } return SOFTBUS_OK; } @@ -122,8 +122,8 @@ static int32_t TransOnBindSuccess(int32_t sessionId, const ISocketListener *sock PeerSocketInfo info; int32_t ret = ClientGetPeerSocketInfoById(sessionId, &info); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "Get peer socket info failed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "Get peer socket info failed, ret=%{public}d", ret); + return ret; } (void)socketCallback->OnBind(sessionId, info); @@ -182,8 +182,8 @@ NO_SANITIZE("cfi") int32_t TransOnSessionOpened(const char *sessionName, const C (void)memset_s(&sessionCallback, sizeof(SessionListenerAdapter), 0, sizeof(SessionListenerAdapter)); int32_t ret = ClientGetSessionCallbackAdapterByName(sessionName, &sessionCallback); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get session listener failed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "get session listener failed, ret=%{public}d", ret); + return ret; } int32_t sessionId = INVALID_SESSION_ID; @@ -279,7 +279,7 @@ NO_SANITIZE("cfi") int32_t TransOnSessionClosed(int32_t channelId, int32_t chann ret = ClientDeleteSession(sessionId); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "client delete session failed"); - return SOFTBUS_ERR; + return ret; } TRANS_LOGI(TRANS_SDK, "ok, sessionId=%{public}d", sessionId); return SOFTBUS_OK; @@ -288,15 +288,17 @@ NO_SANITIZE("cfi") int32_t TransOnSessionClosed(int32_t channelId, int32_t chann static int32_t ProcessReceivedFileData(int32_t sessionId, int32_t channelId, const char *data, uint32_t len, SessionPktType type) { - char sessionName[SESSION_NAME_SIZE_MAX] = {0}; - if (ClientGetSessionDataById(sessionId, sessionName, SESSION_NAME_SIZE_MAX, KEY_SESSION_NAME) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_FILE, "get session name failed"); - return SOFTBUS_ERR; + char sessionName[SESSION_NAME_SIZE_MAX] = { 0 }; + int32_t ret = ClientGetSessionDataById(sessionId, sessionName, SESSION_NAME_SIZE_MAX, KEY_SESSION_NAME); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_FILE, "get sessionName by sessionId=%{public}d failed, ret=%{public}d", sessionId, ret); + return ret; } - if (ProcessFileFrameData(sessionId, channelId, data, len, type) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_FILE, "process fileframe data failed"); - return SOFTBUS_ERR; + ret = ProcessFileFrameData(sessionId, channelId, data, len, type); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_FILE, "process file frame data failed, ret=%{public}d", ret); + return ret; } return SOFTBUS_OK; } @@ -349,7 +351,7 @@ NO_SANITIZE("cfi") int32_t TransOnDataReceived(int32_t channelId, int32_t channe break; default: TRANS_LOGE(TRANS_FILE, "revc unknown session type"); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_INVALID_SESSION_TYPE; } return SOFTBUS_OK; diff --git a/sdk/transmission/session/src/client_trans_session_manager.c b/sdk/transmission/session/src/client_trans_session_manager.c index 77c7a2ff51..41f573ea46 100644 --- a/sdk/transmission/session/src/client_trans_session_manager.c +++ b/sdk/transmission/session/src/client_trans_session_manager.c @@ -80,7 +80,7 @@ int32_t CheckPermissionState(int32_t sessionId) } } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - return SOFTBUS_TRANS_INVALID_SESSION_ID; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } void PermissionStateChange(const char *pkgName, int32_t state) @@ -114,17 +114,17 @@ int TransClientInit(void) if (TransServerProxyInit() != SOFTBUS_OK) { TRANS_LOGE(TRANS_INIT, "init trans ipc proxy failed"); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SERVER_INIT_FAILED; } if (ClientTransChannelInit() != SOFTBUS_OK) { TRANS_LOGE(TRANS_INIT, "init trans channel failed"); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SERVER_INIT_FAILED; } if (RegisterTimeoutCallback(SOFTBUS_TRNAS_IDLE_TIMEOUT_TIMER_FUN, ClientTransSessionTimerProc) != SOFTBUS_OK) { TRANS_LOGE(TRANS_INIT, "init trans idle timer failed"); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SERVER_INIT_FAILED; } ClientTransRegLnnOffline(); @@ -380,8 +380,7 @@ int32_t ClientAddSessionServer(SoftBusSecType type, const char *pkgName, const c (void)SoftBusMutexUnlock(&g_clientSessionServerList->lock); char *tmpName = NULL; Anonymize(server->sessionName, &tmpName); - TRANS_LOGI(TRANS_SDK, "sessionName=%{public}s, pkgName=%{public}s", - tmpName, server->pkgName); + TRANS_LOGI(TRANS_SDK, "sessionName=%{public}s, pkgName=%{public}s", tmpName, server->pkgName); AnonymizeFree(tmpName); return SOFTBUS_OK; } @@ -471,7 +470,7 @@ static int32_t GetSessionById(int32_t sessionId, ClientSessionServer **server, S } } } - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } static int32_t AddSession(const char *sessionName, SessionInfo *session) @@ -487,7 +486,7 @@ static int32_t AddSession(const char *sessionName, SessionInfo *session) continue; } ListAdd(&serverNode->sessionList, &session->node); - TRANS_LOGI(TRANS_SDK, "add sessionId = %{public}d", session->sessionId); + TRANS_LOGI(TRANS_SDK, "add sessionId=%{public}d", session->sessionId); return SOFTBUS_OK; } DestroySessionId(); @@ -645,7 +644,7 @@ int32_t ClientDeleteSession(int32_t sessionId) { TRANS_LOGI(TRANS_SDK, "sessionId=%{public}d", sessionId); if (sessionId < 0) { - return SOFTBUS_ERR; + return SOFTBUS_TRANS_INVALID_SESSION_ID; } if (g_clientSessionServerList == NULL) { @@ -670,7 +669,7 @@ int32_t ClientDeleteSession(int32_t sessionId) continue; } ListDelete(&(sessionNode->node)); - TRANS_LOGI(TRANS_SDK, "delete sessionId = %{public}d", sessionId); + TRANS_LOGI(TRANS_SDK, "delete session by sessionId=%{public}d success", sessionId); DestroySessionId(); SoftBusFree(sessionNode); (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); @@ -679,8 +678,8 @@ int32_t ClientDeleteSession(int32_t sessionId) } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "session id not found"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found session by sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetSessionDataById(int32_t sessionId, char *data, uint16_t len, SessionKey key) @@ -702,13 +701,12 @@ int32_t ClientGetSessionDataById(int32_t sessionId, char *data, uint16_t len, Se ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } - + int32_t ret = EOK; switch (key) { case KEY_SESSION_NAME: ret = strcpy_s(data, len, serverNode->sessionName); @@ -729,8 +727,8 @@ int32_t ClientGetSessionDataById(int32_t sessionId, char *data, uint16_t len, Se (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); if (ret != EOK) { - TRANS_LOGE(TRANS_SDK, "copy data failed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "strcpy_s data info failed, ret=%{public}d", ret); + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; } @@ -757,8 +755,8 @@ int32_t ClientGetSessionIntegerDataById(int32_t sessionId, int *data, SessionKey int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); if (ret != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } switch (key) { case KEY_IS_SERVER: @@ -786,7 +784,7 @@ int32_t ClientGetSessionIntegerDataById(int32_t sessionId, int *data, SessionKey int32_t ClientGetChannelBySessionId(int32_t sessionId, int32_t *channelId, int32_t *type, bool *isEnable) { if (sessionId < 0) { - return SOFTBUS_INVALID_PARAM; + return SOFTBUS_TRANS_INVALID_SESSION_ID; } if (g_clientSessionServerList == NULL) { TRANS_LOGE(TRANS_INIT, "entry list not init"); @@ -801,7 +799,7 @@ int32_t ClientGetChannelBySessionId(int32_t sessionId, int32_t *channelId, int32 SessionInfo *sessionNode = NULL; if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } @@ -836,7 +834,7 @@ int32_t ClientGetChannelBusinessTypeBySessionId(int32_t sessionId, int32_t *busi SessionInfo *sessionNode = NULL; if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } @@ -866,12 +864,10 @@ int32_t ClientSetChannelBySessionId(int32_t sessionId, TransInfo *transInfo) ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); - return ret; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } sessionNode->channelId = transInfo->channelId; sessionNode->channelType = (ChannelType)transInfo->channelType; @@ -915,8 +911,8 @@ int32_t GetEncryptByChannelId(int32_t channelId, int32_t channelType, int32_t *d } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found session with channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found session by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetSessionIdByChannelId(int32_t channelId, int32_t channelType, int32_t *sessionId) @@ -954,8 +950,8 @@ int32_t ClientGetSessionIdByChannelId(int32_t channelId, int32_t channelType, in } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found session with channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found session by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetSessionIsAsyncBySessionId(int32_t sessionId, bool *isAsync) @@ -1029,8 +1025,8 @@ int32_t ClientGetRouteTypeByChannelId(int32_t channelId, int32_t channelType, in } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found routeType with channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found session by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetDataConfigByChannelId(int32_t channelId, int32_t channelType, uint32_t *dataConfig) @@ -1068,8 +1064,8 @@ int32_t ClientGetDataConfigByChannelId(int32_t channelId, int32_t channelType, u } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found dataConfig with channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found session by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientEnableSessionByChannelId(const ChannelInfo *channel, int32_t *sessionId) @@ -1126,9 +1122,9 @@ int32_t ClientEnableSessionByChannelId(const ChannelInfo *channel, int32_t *sess } (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found session with channelId=%{public}d, channelType=%{public}d", + TRANS_LOGE(TRANS_SDK, "not found session by channelId=%{public}d, channelType=%{public}d", channel->channelId, channel->channelType); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetSessionCallbackById(int32_t sessionId, ISessionListener *callback) @@ -1150,18 +1146,17 @@ int32_t ClientGetSessionCallbackById(int32_t sessionId, ISessionListener *callba ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } - ret = memcpy_s(callback, sizeof(ISessionListener), &serverNode->listener.session, sizeof(ISessionListener)); + int32_t ret = memcpy_s(callback, sizeof(ISessionListener), &serverNode->listener.session, sizeof(ISessionListener)); (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); if (ret != EOK) { - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } return SOFTBUS_OK; } @@ -1194,7 +1189,7 @@ int32_t ClientGetSessionCallbackByName(const char *sessionName, ISessionListener &serverNode->listener.session, sizeof(ISessionListener)); (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); if (ret != EOK) { - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } return SOFTBUS_OK; } @@ -1202,9 +1197,9 @@ int32_t ClientGetSessionCallbackByName(const char *sessionName, ISessionListener (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); char *tmpName = NULL; Anonymize(sessionName, &tmpName); - TRANS_LOGE(TRANS_SDK, "not found by sessionName=%{public}s", tmpName); + TRANS_LOGE(TRANS_SDK, "not found session by sessionName=%{public}s", tmpName); AnonymizeFree(tmpName); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetSessionSide(int32_t sessionId) @@ -1244,20 +1239,21 @@ static int32_t ClientTransGetTdcIp(int32_t channelId, char *myIp, int32_t ipLen) { TcpDirectChannelInfo channel; if (TransTdcGetInfoById(channelId, &channel) == NULL) { - TRANS_LOGE(TRANS_SDK, "TdcGetInfo failed channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found Tdc channel by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND; } SocketAddr socket; // The local and peer IP belong to the same network segment, and the type can also be determined by the peer IP - if (ConnGetPeerSocketAddr(channel.detail.fd, &socket) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ConnGetPeerSocketAddr failed fd=%{public}d", channel.detail.fd); - return SOFTBUS_ERR; + int32_t ret = ConnGetPeerSocketAddr(channel.detail.fd, &socket); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "get peer socket addr by fd=%{public}d failed, ret=%{public}d", channel.detail.fd, ret); + return ret; } if (strcpy_s(myIp, ipLen, socket.addr) != EOK) { TRANS_LOGE(TRANS_SDK, "strcpy_s ip failed, len=%{public}zu", strlen(socket.addr)); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; @@ -1267,13 +1263,13 @@ static int32_t ClientTransGetUdpIp(int32_t channelId, char *myIp, int32_t ipLen) { UdpChannel channel; if (TransGetUdpChannel(channelId, &channel) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get UdpChannel failed channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "not found Udp channel by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND; } if (strcpy_s(myIp, ipLen, channel.info.myIp) != EOK) { TRANS_LOGE(TRANS_SDK, "strcpy_s ip failed, len=%{public}zu", strlen(channel.info.myIp)); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } return SOFTBUS_OK; @@ -1404,8 +1400,8 @@ int32_t ReCreateSessionServerToServer(void) { TRANS_LOGD(TRANS_SDK, "enter."); if (g_clientSessionServerList == NULL) { - TRANS_LOGE(TRANS_INIT, "entry list not init"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_INIT, "session server list not init"); + return SOFTBUS_TRANS_SESSION_SERVER_NOINIT; } if (SoftBusMutexLock(&(g_clientSessionServerList->lock)) != 0) { TRANS_LOGE(TRANS_SDK, "lock failed"); @@ -1466,7 +1462,7 @@ int32_t ClientGrantPermission(int uid, int pid, const char *busName) { if (uid < 0 || pid < 0 || busName == NULL) { TRANS_LOGW(TRANS_SDK, "invalid parameter"); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } char *tmpName = NULL; Anonymize(busName, &tmpName); @@ -1483,7 +1479,7 @@ int32_t ClientRemovePermission(const char *busName) { if (busName == NULL) { TRANS_LOGW(TRANS_SDK, "invalid parameter"); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } char *tmpName = NULL; Anonymize(busName, &tmpName); @@ -1504,8 +1500,8 @@ int32_t ClientGetFileConfigInfoById(int32_t sessionId, int32_t *fileEncrypt, int } if (g_clientSessionServerList == NULL) { - TRANS_LOGE(TRANS_INIT, "entry list not init"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_INIT, "session server list not init"); + return SOFTBUS_TRANS_SESSION_SERVER_NOINIT; } if (SoftBusMutexLock(&(g_clientSessionServerList->lock)) != 0) { @@ -1515,11 +1511,10 @@ int32_t ClientGetFileConfigInfoById(int32_t sessionId, int32_t *fileEncrypt, int ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); - return SOFTBUS_NOT_FIND; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } *fileEncrypt = sessionNode->fileEncrypt; *algorithm = sessionNode->algorithm; @@ -1642,11 +1637,10 @@ static int32_t DeleteSocketSession(int32_t sessionId, char *pkgName, char *sessi ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found by sessionId=%{public}d", sessionId); - return SOFTBUS_NOT_FIND; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } if (strcpy_s(pkgName, PKG_NAME_SIZE_MAX, serverNode->pkgName) != EOK) { @@ -1698,7 +1692,7 @@ static int32_t TryDeleteEmptySessionServer(const char *sessionName) (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); TRANS_LOGE(TRANS_SDK, "not found session server or session list is not empty, sessionName=%{public}s", tmpName); AnonymizeFree(tmpName); - return SOFTBUS_NOT_FIND; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientDeleteSocketSession(int32_t sessionId) @@ -1898,11 +1892,10 @@ int32_t ClientSetListenerBySessionId(int32_t sessionId, const ISocketListener *l ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found"); - return ret; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } if (sessionNode->role != SESSION_ROLE_INIT) { @@ -1912,10 +1905,10 @@ int32_t ClientSetListenerBySessionId(int32_t sessionId, const ISocketListener *l } ISocketListener *socketListener = isServer ? &(serverNode->listener.socketServer) : &(serverNode->listener.socketClient); - ret = memcpy_s(socketListener, sizeof(ISocketListener), listener, sizeof(ISocketListener)); + int32_t ret = memcpy_s(socketListener, sizeof(ISocketListener), listener, sizeof(ISocketListener)); if (ret != EOK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "memcpy failed"); + TRANS_LOGE(TRANS_SDK, "memcpy_s socketListener failed, ret=%{public}d", ret); return SOFTBUS_MEM_ERR; } serverNode->listener.isSocketListener = true; @@ -1982,7 +1975,7 @@ int32_t ClientIpcOpenSession(int32_t sessionId, const QosTV *qos, uint32_t qosCo if (g_clientSessionServerList == NULL) { TRANS_LOGE(TRANS_SDK, "not init"); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SESSION_SERVER_NOINIT; } if (SoftBusMutexLock(&(g_clientSessionServerList->lock)) != 0) { @@ -1992,13 +1985,12 @@ int32_t ClientIpcOpenSession(int32_t sessionId, const QosTV *qos, uint32_t qosCo ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "not found sessionInfo, socket=%{public}d, ret=%{public}d", sessionId, ret); - return SOFTBUS_NOT_FIND; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } - ret = CheckBindSocketInfo(sessionNode); + int32_t ret = CheckBindSocketInfo(sessionNode); if (ret != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); TRANS_LOGE(TRANS_SDK, "check socekt info failed, ret=%{public}d", ret); @@ -2045,11 +2037,10 @@ int32_t ClientSetSocketState(int32_t socket, uint32_t maxIdleTimeout, SessionRol ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(socket, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(socket, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "SessionInfo not found, socket=%{public}d", socket); - return ret; + TRANS_LOGE(TRANS_SDK, "socket not found. socketFd=%{public}d", socket); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } sessionNode->role = role; @@ -2091,7 +2082,8 @@ int32_t ClientGetSessionCallbackAdapterByName(const char *sessionName, SessionLi &serverNode->listener, sizeof(SessionListenerAdapter)); (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); if (ret != EOK) { - TRANS_LOGE(TRANS_SDK, "memcpy SessionListenerAdapter failed, sessionName=%{public}s", sessionName); + TRANS_LOGE(TRANS_SDK, + "memcpy SessionListenerAdapter failed, sessionName=%{public}s, ret=%{public}d", sessionName, ret); return SOFTBUS_MEM_ERR; } return SOFTBUS_OK; @@ -2121,27 +2113,27 @@ int32_t ClientGetSessionCallbackAdapterById(int32_t sessionId, SessionListenerAd ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(sessionId, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "SessionInfo not found, socket=%{public}d", sessionId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "session not found. sessionId=%{public}d", sessionId); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } - ret = memcpy_s(callbackAdapter, sizeof(SessionListenerAdapter), &serverNode->listener, + int32_t ret = memcpy_s(callbackAdapter, sizeof(SessionListenerAdapter), &serverNode->listener, sizeof(SessionListenerAdapter)); *isServer = sessionNode->isServer; (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); if (ret != EOK) { - TRANS_LOGE(TRANS_SDK, "memcpy SessionListenerAdapter failed, socket=%{public}d", sessionId); + TRANS_LOGE(TRANS_SDK, + "memcpy SessionListenerAdapter failed, socket=%{public}d, ret=%{public}d", sessionId, ret); return SOFTBUS_MEM_ERR; } return SOFTBUS_OK; } -int32_t ClientGetPeerSocketInfoById(int32_t sessionId, PeerSocketInfo *peerSocketInfo) +int32_t ClientGetPeerSocketInfoById(int32_t socket, PeerSocketInfo *peerSocketInfo) { - if (sessionId < 0 || peerSocketInfo == NULL) { + if (socket < 0 || peerSocketInfo == NULL) { TRANS_LOGE(TRANS_SDK, "Invalid param"); return SOFTBUS_INVALID_PARAM; } @@ -2158,11 +2150,10 @@ int32_t ClientGetPeerSocketInfoById(int32_t sessionId, PeerSocketInfo *peerSocke ClientSessionServer *serverNode = NULL; SessionInfo *sessionNode = NULL; - int32_t ret = GetSessionById(sessionId, &serverNode, &sessionNode); - if (ret != SOFTBUS_OK) { + if (GetSessionById(socket, &serverNode, &sessionNode) != SOFTBUS_OK) { (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); - TRANS_LOGE(TRANS_SDK, "SessionInfo not found, socket=%{public}d", sessionId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "socket not found. socketFd=%{public}d", socket); + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } peerSocketInfo->name = sessionNode->info.peerSessionName; @@ -2262,7 +2253,7 @@ int32_t ClientResetIdleTimeoutById(int32_t sessionId) { if (sessionId <= 0) { TRANS_LOGE(TRANS_SDK, "invalid sessionId"); - return SOFTBUS_INVALID_PARAM; + return SOFTBUS_TRANS_INVALID_SESSION_ID; } if (g_clientSessionServerList == NULL) { @@ -2293,7 +2284,7 @@ int32_t ClientResetIdleTimeoutById(int32_t sessionId) } (void)SoftBusMutexUnlock(&g_clientSessionServerList->lock); TRANS_LOGE(TRANS_SDK, "not found session by sessionId=%{public}d", sessionId); - return SOFTBUS_NOT_FIND; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientGetSessionNameByChannelId(int32_t channelId, int32_t channelType, char *sessionName, int32_t len) @@ -2332,7 +2323,7 @@ int32_t ClientGetSessionNameByChannelId(int32_t channelId, int32_t channelType, (void)SoftBusMutexUnlock(&(g_clientSessionServerList->lock)); TRANS_LOGE(TRANS_SDK, "not found session with channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND; } int32_t ClientRawStreamEncryptDefOptGet(const char *sessionName, bool *isEncrypt) diff --git a/sdk/transmission/session/src/client_trans_session_service.c b/sdk/transmission/session/src/client_trans_session_service.c index 1cb45d3fca..6d8563aab8 100644 --- a/sdk/transmission/session/src/client_trans_session_service.c +++ b/sdk/transmission/session/src/client_trans_session_service.c @@ -78,21 +78,24 @@ static bool IsValidListener(const ISessionListener *listener) static int32_t OpenSessionWithExistSession(int32_t sessionId, bool isEnabled) { if (!isEnabled) { - TRANS_LOGI(TRANS_SDK, "the channel is opening"); + int32_t errCode = SOFTBUS_TRANS_SESSION_OPENING; + TRANS_LOGI(TRANS_SDK, "the channel is opening, errCode=%{public}d", errCode); return sessionId; } - ISessionListener listener = {0}; - if (ClientGetSessionCallbackById(sessionId, &listener) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get session listener failed"); + ISessionListener listener = { 0 }; + int32_t ret = ClientGetSessionCallbackById(sessionId, &listener); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "get session listener failed, ret=%{public}d", ret); CloseSession(sessionId); - return INVALID_SESSION_ID; + return SOFTBUS_TRANS_INVALID_SESSION_ID; } - if (listener.OnSessionOpened(sessionId, SOFTBUS_OK) != 0) { - TRANS_LOGE(TRANS_SDK, "session callback OnSessionOpened failed"); + ret = listener.OnSessionOpened(sessionId, SOFTBUS_OK); + if (ret != 0) { + TRANS_LOGE(TRANS_SDK, "session callback OnSessionOpened failed, ret=%{public}d", ret); CloseSession(sessionId); - return INVALID_SESSION_ID; + return SOFTBUS_TRANS_INVALID_SESSION_ID; } return sessionId; } @@ -106,8 +109,7 @@ int CreateSessionServer(const char *pkgName, const char *sessionName, const ISes } char *tmpName = NULL; Anonymize(sessionName, &tmpName); - TRANS_LOGI(TRANS_SDK, "pkgName=%{public}s, sessionName=%{public}s", - pkgName, tmpName); + TRANS_LOGI(TRANS_SDK, "pkgName=%{public}s, sessionName=%{public}s", pkgName, tmpName); AnonymizeFree(tmpName); if (InitSoftBus(pkgName) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "init softbus err"); @@ -129,13 +131,14 @@ int CreateSessionServer(const char *pkgName, const char *sessionName, const ISes ret = ServerIpcCreateSessionServer(pkgName, sessionName); if (ret == SOFTBUS_SERVER_NAME_REPEATED) { - TRANS_LOGI(TRANS_SDK, "SessionServer is already created in server"); - ret = SOFTBUS_OK; + TRANS_LOGW(TRANS_SDK, "ok, SessionServer is already created in server"); + return SOFTBUS_OK; } else if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "Server createSessionServer failed"); + TRANS_LOGE(TRANS_SDK, "createSessionServer failed, ret=%{public}d", ret); (void)ClientDeleteSessionServer(SEC_TYPE_CIPHERTEXT, sessionName); + return ret; } - TRANS_LOGI(TRANS_SDK, "ok: ret=%{public}d", ret); + TRANS_LOGI(TRANS_SDK, "ok"); return ret; } @@ -147,8 +150,7 @@ int RemoveSessionServer(const char *pkgName, const char *sessionName) } char *tmpName = NULL; Anonymize(sessionName, &tmpName); - TRANS_LOGW(TRANS_SDK, "pkgName=%{public}s, sessionName=%{public}s", - pkgName, tmpName); + TRANS_LOGI(TRANS_SDK, "pkgName=%{public}s, sessionName=%{public}s", pkgName, tmpName); int32_t ret = ServerIpcRemoveSessionServer(pkgName, sessionName); if (ret != SOFTBUS_OK) { @@ -166,7 +168,7 @@ int RemoveSessionServer(const char *pkgName, const char *sessionName) } DeleteFileListener(sessionName); AnonymizeFree(tmpName); - TRANS_LOGI(TRANS_SDK, "ok: ret=%{public}d", ret); + TRANS_LOGI(TRANS_SDK, "ok"); return ret; } @@ -178,14 +180,14 @@ static int32_t CheckParamIsValid(const char *mySessionName, const char *peerSess Anonymize(mySessionName, &tmpMyName); TRANS_LOGE(TRANS_SDK, "invalid mySessionName. tmpMyName=%{public}s", tmpMyName); AnonymizeFree(tmpMyName); - return SOFTBUS_INVALID_PARAM; + return SOFTBUS_TRANS_INVALID_SESSION_NAME; } if (!IsValidString(peerSessionName, SESSION_NAME_SIZE_MAX - 1)) { char *tmpPeerName = NULL; Anonymize(peerSessionName, &tmpPeerName); TRANS_LOGE(TRANS_SDK, "invalid peerSessionName. tmpPeerName=%{public}s", tmpPeerName); AnonymizeFree(tmpPeerName); - return SOFTBUS_INVALID_PARAM; + return SOFTBUS_TRANS_INVALID_SESSION_NAME; } if (!IsValidString(peerNetworkId, DEVICE_ID_SIZE_MAX - 1)) { char *tmpPeerNetworkId = NULL; @@ -250,7 +252,7 @@ int OpenSession(const char *mySessionName, const char *peerSessionName, const ch SessionAttribute *tmpAttr = BuildParamSessionAttribute(attr); if (tmpAttr == NULL) { TRANS_LOGE(TRANS_SDK, "Build SessionAttribute failed"); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } SessionParam param = { .sessionName = mySessionName, @@ -290,10 +292,10 @@ int OpenSession(const char *mySessionName, const char *peerSessionName, const ch ret = ClientSetChannelBySessionId(sessionId, &transInfo); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "open session failed"); + TRANS_LOGE(TRANS_SDK, "set channel by sessionId failed, ret=%{public}d", ret); SoftBusFree(tmpAttr); (void)ClientDeleteSession(sessionId); - return INVALID_SESSION_ID; + return SOFTBUS_TRANS_SESSION_SET_CHANNEL_FAILED; } TRANS_LOGI(TRANS_SDK, "ok: sessionId=%{public}d, channelId=%{public}d, channelType=%{public}d", sessionId, transInfo.channelId, transInfo.channelType); @@ -318,7 +320,7 @@ static int32_t ConvertAddrStr(const char *addrStr, ConnectionAddr *addrInfo) TRANS_LOGE(TRANS_SDK, "memset_s info fail"); return SOFTBUS_MEM_ERR; } - int port; + int32_t port; if (GetJsonObjectStringItem(obj, "ETH_IP", addrInfo->info.ip.ip, IP_STR_MAX_LEN) && GetJsonObjectNumberItem(obj, "ETH_PORT", &port)) { addrInfo->info.ip.port = (uint16_t)port; @@ -417,9 +419,9 @@ int OpenAuthSession(const char *sessionName, const ConnectionAddr *addrInfo, int } ret = ClientSetChannelBySessionId(sessionId, &transInfo); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "failed"); + TRANS_LOGE(TRANS_SDK, "set channel by sessionId failed, ret=%{public}d", ret); (void)ClientDeleteSession(sessionId); - return INVALID_SESSION_ID; + return SOFTBUS_TRANS_SESSION_SET_CHANNEL_FAILED; } TRANS_LOGI(TRANS_SDK, "ok: sessionId=%{public}d, channelId=%{public}d, channelType=%{public}d", sessionId, transInfo.channelId, transInfo.channelType); @@ -437,20 +439,23 @@ void NotifyAuthSuccess(int sessionId) return; } - int isServer = 0; - if (ClientGetSessionIntegerDataById(sessionId, &isServer, KEY_IS_SERVER) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get isServer failed"); + int32_t isServer = 0; + ret = ClientGetSessionIntegerDataById(sessionId, &isServer, KEY_IS_SERVER); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "get isServer failed, ret=%{public}d", ret); return; } - if (isServer) { + if (isServer == 1) { TRANS_LOGE(TRANS_SDK, "device is service side, no notification"); return; } - TRANS_LOGI(TRANS_SDK, "device is client side"); + TRANS_LOGI(TRANS_SDK, + "client side, notify auth success channelId=%{public}d, channelType=%{public}d", channelId, channelType); - if (ServerIpcNotifyAuthSuccess(channelId, channelType) != SOFTBUS_OK) { + ret = ServerIpcNotifyAuthSuccess(channelId, channelType); + if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, - "ServerIpcNotifyAuthSuccess err channelId=%{public}d, channeltype=%{public}d", channelId, channelType); + "ServerIpcNotifyAuthSuccess err channelId=%{public}d, ret=%{public}d", channelId, ret); return; } } @@ -464,7 +469,7 @@ static int32_t CheckSessionIsOpened(int32_t sessionId) while (i < SESSION_STATUS_CHECK_MAX_NUM) { if (ClientGetChannelBySessionId(sessionId, NULL, NULL, &isEnable) != SOFTBUS_OK) { - return SOFTBUS_NOT_FIND; + return SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED; } if (isEnable == true) { TRANS_LOGI(TRANS_SDK, "session is enable"); @@ -475,7 +480,7 @@ static int32_t CheckSessionIsOpened(int32_t sessionId) } TRANS_LOGE(TRANS_SDK, "session open timeout"); - return SOFTBUS_ERR; + return SOFTBUS_TIMOUT; } int OpenSessionSync(const char *mySessionName, const char *peerSessionName, const char *peerNetworkId, @@ -522,7 +527,7 @@ int OpenSessionSync(const char *mySessionName, const char *peerSessionName, cons } ret = ClientSetChannelBySessionId(sessionId, &transInfo); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "server open session err: ret=%{public}d", ret); + TRANS_LOGE(TRANS_SDK, "set channel by sessionId=%{public}d, ret=%{public}d", sessionId, ret); (void)ClientDeleteSession(sessionId); return SOFTBUS_TRANS_SESSION_SET_CHANNEL_FAILED; } @@ -550,12 +555,12 @@ void CloseSession(int sessionId) } ret = ClientGetChannelBySessionId(sessionId, &channelId, &type, NULL); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channel err: ret=%{public}d", ret); + TRANS_LOGE(TRANS_SDK, "get channel by sessionId=%{public}d, ret=%{public}d", sessionId, ret); return; } ret = ClientTransCloseChannel(channelId, type); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "close channel err: ret=%{public}d, channelId=%{public}d, channeType=%{public}d", + TRANS_LOGE(TRANS_SDK, "close channel err: ret=%{public}d, channelId=%{public}d, channelType=%{public}d", ret, channelId, type); } ret = ClientDeleteSession(sessionId); @@ -569,32 +574,36 @@ void CloseSession(int sessionId) int GetMySessionName(int sessionId, char *sessionName, unsigned int len) { if (!IsValidSessionId(sessionId) || (sessionName == NULL) || (len > SESSION_NAME_SIZE_MAX)) { + TRANS_LOGE(TRANS_SDK, "invalid param"); return SOFTBUS_INVALID_PARAM; } - + TRANS_LOGI(TRANS_SDK, "get client sessionName by sessionId=%{public}d", sessionId); return ClientGetSessionDataById(sessionId, sessionName, len, KEY_SESSION_NAME); } int GetPeerSessionName(int sessionId, char *sessionName, unsigned int len) { if (!IsValidSessionId(sessionId) || (sessionName == NULL) || (len > SESSION_NAME_SIZE_MAX)) { + TRANS_LOGE(TRANS_SDK, "invalid param"); return SOFTBUS_INVALID_PARAM; } - + TRANS_LOGI(TRANS_SDK, "get server sessionName by sessionId=%{public}d", sessionId); return ClientGetSessionDataById(sessionId, sessionName, len, KEY_PEER_SESSION_NAME); } int GetPeerDeviceId(int sessionId, char *networkId, unsigned int len) { if (!IsValidSessionId(sessionId) || (networkId == NULL) || (len > SESSION_NAME_SIZE_MAX)) { + TRANS_LOGE(TRANS_SDK, "invalid param"); return SOFTBUS_INVALID_PARAM; } - + TRANS_LOGI(TRANS_SDK, "get server deviceId by sessionId=%{public}d", sessionId); return ClientGetSessionDataById(sessionId, networkId, len, KEY_PEER_DEVICE_ID); } int GetSessionSide(int sessionId) { + TRANS_LOGI(TRANS_SDK, "get session side by sessionId=%{public}d", sessionId); return ClientGetSessionSide(sessionId); } @@ -625,6 +634,10 @@ int SetFileReceiveListener(const char *pkgName, const char *sessionName, TRANS_LOGE(TRANS_SDK, "set file receive listener init softbus client error"); return SOFTBUS_TRANS_SESSION_ADDPKG_FAILED; } + char *tmpName = NULL; + Anonymize(sessionName, &tmpName); + TRANS_LOGI(TRANS_SDK, "sessionName=%{public}s", tmpName); + AnonymizeFree(tmpName); return TransSetFileReceiveListener(sessionName, recvListener, rootDir); } @@ -639,6 +652,10 @@ int SetFileSendListener(const char *pkgName, const char *sessionName, const IFil TRANS_LOGE(TRANS_SDK, "set file send listener init softbus client error"); return SOFTBUS_TRANS_SESSION_ADDPKG_FAILED; } + char *tmpName = NULL; + Anonymize(sessionName, &tmpName); + TRANS_LOGI(TRANS_SDK, "sessionName=%{public}s", tmpName); + AnonymizeFree(tmpName); return TransSetFileSendListener(sessionName, sendListener); } @@ -647,11 +664,12 @@ static const char *g_deviceStatusName = "ohos.msdp.device_status"; static int32_t IsValidDFSSession(int32_t sessionId, int32_t *channelId) { - char sessionName[SESSION_NAME_SIZE_MAX] = {0}; + char sessionName[SESSION_NAME_SIZE_MAX] = { 0 }; int32_t type; - if (GetMySessionName(sessionId, sessionName, SESSION_NAME_SIZE_MAX) != SOFTBUS_OK) { + int32_t ret = GetMySessionName(sessionId, sessionName, SESSION_NAME_SIZE_MAX); + if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "get dfs session name failed"); - return SOFTBUS_ERR; + return ret; } if (strncmp(sessionName, g_busName, strlen(g_busName)) != 0 && strncmp(sessionName, g_deviceStatusName, strlen(g_deviceStatusName)) != 0) { @@ -659,9 +677,10 @@ static int32_t IsValidDFSSession(int32_t sessionId, int32_t *channelId) return SOFTBUS_TRANS_FUNC_NOT_SUPPORT; } - if (ClientGetChannelBySessionId(sessionId, channelId, &type, NULL) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channel failed"); - return SOFTBUS_ERR; + ret = ClientGetChannelBySessionId(sessionId, channelId, &type, NULL); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "get channel by sessionId=%{public}d failed, ret=%{public}d", sessionId, ret); + return SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED; } if (type != CHANNEL_TYPE_TCP_DIRECT) { TRANS_LOGE(TRANS_SDK, "invalid channel type"); @@ -723,16 +742,17 @@ int32_t QosReport(int32_t sessionId, int32_t appType, int32_t quality) int32_t type = CHANNEL_TYPE_BUTT; int32_t ret = ClientGetChannelBySessionId(sessionId, &channelId, &type, NULL); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channel err, ret=%{public}d.", ret); - return ret; + TRANS_LOGE(TRANS_SDK, "get channel by sessionId=%{public}d failed, ret=%{public}d.", sessionId, ret); + return SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED; } if (ClientGetSessionSide(sessionId) != IS_CLIENT) { TRANS_LOGE(TRANS_SDK, "qos report not exist or not client side. sessionId=%{public}d", sessionId); return SOFTBUS_TRANS_INVALID_SESSION_ID; } - if ((ret = ClientQosReport(channelId, type, appType, quality)) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "qos report failed. sessionId=%{public}d", sessionId); + ret = ClientQosReport(channelId, type, appType, quality); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "qos report failed. sessionId=%{public}d, ret=%{public}d", sessionId, ret); } return ret; } @@ -838,8 +858,8 @@ int GetSessionOption(int sessionId, SessionOption option, void* optionValue, uin int32_t type = CHANNEL_TYPE_BUTT; int32_t ret = ClientGetChannelBySessionId(sessionId, &channelId, &type, NULL); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channel err, ret=%{public}d.", ret); - return ret; + TRANS_LOGE(TRANS_SDK, "get channel by sessionId=%{public}d failed, ret=%{public}d.", sessionId, ret); + return SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED; } return g_SessionOptionArr[option].readFunc(channelId, type, optionValue, valueSize); @@ -864,22 +884,23 @@ int CreateSocket(const char *pkgName, const char *sessionName) int ret = ClientAddSocketServer(SEC_TYPE_CIPHERTEXT, pkgName, sessionName); if (ret == SOFTBUS_SERVER_NAME_REPEATED) { - TRANS_LOGI(TRANS_SDK, "SessionServer is already created in client"); + TRANS_LOGW(TRANS_SDK, "SocketServer is already created in client"); } else if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "add session server err, ret=%{public}d.", ret); + TRANS_LOGE(TRANS_SDK, "add socket server err, ret=%{public}d.", ret); return ret; } ret = ServerIpcCreateSessionServer(pkgName, sessionName); if (ret == SOFTBUS_SERVER_NAME_REPEATED) { - TRANS_LOGI(TRANS_SDK, "SessionServer is already created in server"); - ret = SOFTBUS_OK; + TRANS_LOGI(TRANS_SDK, "ok, SocketServer is already created in server"); + return SOFTBUS_OK; } else if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "Server createSessionServer failed"); + TRANS_LOGE(TRANS_SDK, "createSocketServer failed, ret=%{public}d", ret); (void)ClientDeleteSessionServer(SEC_TYPE_CIPHERTEXT, sessionName); + return ret; } - TRANS_LOGI(TRANS_SDK, "CreateSocket ok: ret=%{public}d", ret); - return ret; + TRANS_LOGI(TRANS_SDK, "ok"); + return SOFTBUS_OK; } static SessionAttribute *CreateSessionAttributeBySocketInfoTrans(const SocketInfo *info, bool *isEncyptedRawStream) @@ -1036,28 +1057,28 @@ int32_t ClientBind(int32_t socket, const QosTV qos[], uint32_t qosCount, const I int32_t ret = ClientSetListenerBySessionId(socket, listener, false); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ClientBind set listener failed, ret=%{public}d", ret); + TRANS_LOGE(TRANS_SDK, "set listener by socket=%{public}d failed, ret=%{public}d", socket, ret); return ret; } uint32_t maxIdleTimeout = 0; ret = GetMaxIdleTimeout(qos, qosCount, &maxIdleTimeout); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ClientBind get maximum idle time failed, ret=%d", ret); + TRANS_LOGE(TRANS_SDK, "get maximum idle time failed, ret=%{public}d", ret); return ret; } (void)SetSessionIsAsyncById(socket, isAsync); TransInfo transInfo; ret = ClientIpcOpenSession(socket, qos, qosCount, &transInfo, isAsync); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ClientBind open session failed, ret=%{public}d", ret); + TRANS_LOGE(TRANS_SDK, "open session failed, ret=%{public}d", ret); return ret; } if (!isAsync) { ret = ClientSetChannelBySessionId(socket, &transInfo); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "set channel failed"); - return ret; + TRANS_LOGE(TRANS_SDK, "set channel by socket=%{public}d failed, ret=%{public}d", socket, ret); + return SOFTBUS_TRANS_SESSION_SET_CHANNEL_FAILED; } ret = CheckSessionIsOpened(socket); @@ -1069,7 +1090,7 @@ int32_t ClientBind(int32_t socket, const QosTV qos[], uint32_t qosCount, const I ret = ClientSetSocketState(socket, maxIdleTimeout, SESSION_ROLE_CLIENT); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "set session role failed, ret=%{public}d", ret); - return SOFTBUS_ERR; + return ret; } if (!isAsync) { TRANS_LOGI(TRANS_SDK, "Bind ok: socket=%{public}d, channelId=%{public}d, channelType=%{public}d", socket, @@ -1089,21 +1110,21 @@ int32_t ClientListen(int32_t socket, const QosTV qos[], uint32_t qosCount, const int32_t ret = ClientSetListenerBySessionId(socket, listener, true); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "set listener failed. ret=%{public}d", ret); + TRANS_LOGE(TRANS_SDK, "set listener by socket=%{public}d failed. ret=%{public}d", socket, ret); return ret; } uint32_t maxIdleTimeout = 0; ret = GetMaxIdleTimeout(qos, qosCount, &maxIdleTimeout); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ClientBind get maximum idle time failed, ret=%d", ret); + TRANS_LOGE(TRANS_SDK, "get maximum idle time failed, ret=%{public}d", ret); return ret; } ret = ClientSetSocketState(socket, maxIdleTimeout, SESSION_ROLE_SERVER); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "set session role failed. ret=%{public}d", ret); - return SOFTBUS_ERR; + return ret; } TRANS_LOGI(TRANS_SDK, "Listen ok: socket=%{public}d", socket); @@ -1121,7 +1142,7 @@ void ClientShutdown(int32_t socket) int32_t type = CHANNEL_TYPE_BUTT; int32_t ret = ClientGetChannelBySessionId(socket, &channelId, &type, NULL); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channel err: ret=%{public}d", ret); + TRANS_LOGE(TRANS_SDK, "get channel by socket=%{public}d failed, ret=%{public}d", socket, ret); return; } @@ -1150,7 +1171,7 @@ int32_t GetSocketMtuSize(int32_t socket, uint32_t *mtuSize) bool isEnable = false; int32_t ret = ClientGetChannelBySessionId(socket, &channelId, &type, &isEnable); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channel err, ret=%{public}d.", ret); + TRANS_LOGE(TRANS_SDK, "get channel by socket=%{public}d failed, ret=%{public}d.", socket, ret); return ret; } @@ -1161,7 +1182,7 @@ int32_t GetSocketMtuSize(int32_t socket, uint32_t *mtuSize) uint32_t dataConfig = INVALID_DATA_CONFIG; if (ClientGetDataConfigByChannelId(channelId, type, &dataConfig) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get config failed."); + TRANS_LOGE(TRANS_SDK, "get config by channelId=%{public}d failed", channelId); return SOFTBUS_GET_CONFIG_VAL_ERR; } diff --git a/sdk/transmission/session/src/client_trans_socket_service.c b/sdk/transmission/session/src/client_trans_socket_service.c index 6312c505f9..24968f2de3 100644 --- a/sdk/transmission/session/src/client_trans_socket_service.c +++ b/sdk/transmission/session/src/client_trans_socket_service.c @@ -85,15 +85,15 @@ int32_t Socket(SocketInfo info) return ret; } - int32_t secoketFd = INVALID_SESSION_ID; - ret = ClientAddSocket(&info, &secoketFd); + int32_t socketFd = INVALID_SESSION_ID; + ret = ClientAddSocket(&info, &socketFd); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "add socket failed, ret=%{public}d.", ret); return ret; } - TRANS_LOGI(TRANS_SDK, "create socket ok, socket=%{public}d", secoketFd); - return secoketFd; + TRANS_LOGI(TRANS_SDK, "create socket ok, socket=%{public}d", socketFd); + return socketFd; } int32_t Listen(int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener) diff --git a/sdk/transmission/trans_channel/manager/src/client_trans_channel_manager.c b/sdk/transmission/trans_channel/manager/src/client_trans_channel_manager.c index 63459778d1..c917e59b13 100644 --- a/sdk/transmission/trans_channel/manager/src/client_trans_channel_manager.c +++ b/sdk/transmission/trans_channel/manager/src/client_trans_channel_manager.c @@ -85,7 +85,7 @@ int32_t ClientTransCloseChannel(int32_t channelId, int32_t type) return ret; } -int32_t ClientTransChannelSendBytes(int32_t channelId, int32_t type, const void *data, uint32_t len) +int32_t ClientTransChannelSendBytes(int32_t channelId, int32_t channelType, const void *data, uint32_t len) { if ((data == NULL) || (len == 0)) { TRANS_LOGW(TRANS_BYTES, "Invalid param"); @@ -93,7 +93,7 @@ int32_t ClientTransChannelSendBytes(int32_t channelId, int32_t type, const void } int32_t ret = SOFTBUS_OK; - switch (type) { + switch (channelType) { case CHANNEL_TYPE_AUTH: ret = TransAuthChannelSendBytes(channelId, data, len); break; @@ -104,13 +104,13 @@ int32_t ClientTransChannelSendBytes(int32_t channelId, int32_t type, const void ret = TransTdcSendBytes(channelId, data, len); break; default: - TRANS_LOGE(TRANS_SDK, "Invalid type"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "Invalid channelType=%{public}d", channelType); + return SOFTBUS_TRANS_INVALID_CHANNEL_TYPE; } return ret; } -int32_t ClientTransChannelSendMessage(int32_t channelId, int32_t type, const void *data, uint32_t len) +int32_t ClientTransChannelSendMessage(int32_t channelId, int32_t channelType, const void *data, uint32_t len) { if ((data == NULL) || (len == 0)) { TRANS_LOGW(TRANS_MSG, "Invalid param."); @@ -118,7 +118,7 @@ int32_t ClientTransChannelSendMessage(int32_t channelId, int32_t type, const voi } int32_t ret = SOFTBUS_OK; - switch (type) { + switch (channelType) { case CHANNEL_TYPE_AUTH: ret = TransAuthChannelSendMessage(channelId, data, len); break; @@ -129,13 +129,13 @@ int32_t ClientTransChannelSendMessage(int32_t channelId, int32_t type, const voi ret = TransTdcSendMessage(channelId, data, len); break; default: - TRANS_LOGE(TRANS_MSG, "Invalid type."); + TRANS_LOGE(TRANS_MSG, "Invalid channelType=%{public}d", channelType); return SOFTBUS_TRANS_CHANNEL_TYPE_INVALID; } return ret; } -int32_t ClientTransChannelSendStream(int32_t channelId, int32_t type, const StreamData *data, +int32_t ClientTransChannelSendStream(int32_t channelId, int32_t channelType, const StreamData *data, const StreamData *ext, const StreamFrameInfo *param) { if ((data == NULL) || (ext == NULL) || (param == NULL)) { @@ -144,22 +144,22 @@ int32_t ClientTransChannelSendStream(int32_t channelId, int32_t type, const Stre } int32_t ret = SOFTBUS_OK; - switch (type) { + switch (channelType) { case CHANNEL_TYPE_UDP: ret = TransUdpChannelSendStream(channelId, data, ext, param); break; default: - TRANS_LOGE(TRANS_STREAM, "unsupport channelType=%{public}d.", type); + TRANS_LOGE(TRANS_STREAM, "unsupport channelType=%{public}d.", channelType); return SOFTBUS_TRANS_CHANNEL_TYPE_INVALID; } return ret; } -int32_t ClientTransChannelSendFile(int32_t channelId, int32_t type, const char *sFileList[], +int32_t ClientTransChannelSendFile(int32_t channelId, int32_t channelType, const char *sFileList[], const char *dFileList[], uint32_t fileCnt) { int32_t ret = SOFTBUS_OK; - switch (type) { + switch (channelType) { case CHANNEL_TYPE_UDP: ret = TransUdpChannelSendFile(channelId, sFileList, dFileList, fileCnt); break; @@ -167,7 +167,7 @@ int32_t ClientTransChannelSendFile(int32_t channelId, int32_t type, const char * ret = TransProxyChannelSendFile(channelId, sFileList, dFileList, fileCnt); break; default: - TRANS_LOGE(TRANS_FILE, "unsupport channelType=%{public}d.", type); + TRANS_LOGE(TRANS_FILE, "unsupport channelType=%{public}d.", channelType); return SOFTBUS_TRANS_CHANNEL_TYPE_INVALID; } return ret; diff --git a/sdk/transmission/trans_channel/proxy/src/client_trans_pending.c b/sdk/transmission/trans_channel/proxy/src/client_trans_pending.c index f82b02c44a..cf36c52425 100644 --- a/sdk/transmission/trans_channel/proxy/src/client_trans_pending.c +++ b/sdk/transmission/trans_channel/proxy/src/client_trans_pending.c @@ -92,7 +92,7 @@ int32_t CreatePendingPacket(uint32_t id, uint64_t seq) if (SoftBusMutexInit(&pending->lock, NULL) != SOFTBUS_OK) { SoftBusFree(pending); TRANS_LOGE(TRANS_SDK, "init lock fail"); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } if (SoftBusCondInit(&pending->cond) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "condInit fail"); @@ -167,8 +167,13 @@ static int32_t TransPendWaitTime(const PendingPacket *pending, TransPendData *da int32_t GetPendingPacketData(uint32_t id, uint64_t seq, uint32_t waitMillis, bool isDelete, TransPendData *data) { - if (data == NULL || SoftBusMutexLock(&g_pendingLock) != SOFTBUS_OK) { - return SOFTBUS_ERR; + if (data == NULL) { + TRANS_LOGE(TRANS_SDK, "invalid param"); + return SOFTBUS_INVALID_PARAM; + } + if (SoftBusMutexLock(&g_pendingLock) != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "mutex lock fail"); + return SOFTBUS_LOCK_ERR; } PendingPacket *pending = NULL; PendingPacket *item = NULL; @@ -204,6 +209,10 @@ EXIT: int32_t SetPendingPacketData(uint32_t id, uint64_t seq, const TransPendData *data) { + if (data == NULL) { + TRANS_LOGE(TRANS_SDK, "invalid param"); + return SOFTBUS_INVALID_PARAM; + } if (SoftBusMutexLock(&g_pendingLock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "mutex lock fail"); return SOFTBUS_LOCK_ERR; @@ -228,5 +237,5 @@ int32_t SetPendingPacketData(uint32_t id, uint64_t seq, const TransPendData *dat } } (void)SoftBusMutexUnlock(&g_pendingLock); - return SOFTBUS_ERR; + return SOFTBUS_NOT_FIND; } \ No newline at end of file diff --git a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_common.c b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_common.c index b5ee9f2e3e..59cdda97bd 100644 --- a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_common.c +++ b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_common.c @@ -57,19 +57,19 @@ bool IsPathValid(char *filePath) int32_t GetAndCheckRealPath(const char *filePath, char *absPath) { if ((filePath == NULL) || (absPath == NULL)) { - TRANS_LOGE(TRANS_FILE, "input invalid"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_FILE, "invalid param"); + return SOFTBUS_INVALID_PARAM; } if (SoftBusRealPath(filePath, absPath) == NULL) { TRANS_LOGE(TRANS_FILE, "softbus realpath failed"); - return SOFTBUS_ERR; + return SOFTBUS_FILE_ERR; } int32_t pathLength = (int32_t)(strlen(absPath)); if (pathLength > (MAX_FILE_PATH_NAME_LEN - 1)) { TRANS_LOGE(TRANS_FILE, "pathLength is too large. pathLength=%{public}d", pathLength); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } return SOFTBUS_OK; } @@ -195,8 +195,8 @@ const char *TransGetFileName(const char *path) int32_t FileListToBuffer(const char **destFile, uint32_t fileCnt, FileListBuffer *outbufferInfo) { if (destFile == NULL || outbufferInfo == NULL || fileCnt == 0) { - TRANS_LOGE(TRANS_FILE, "bad input"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_FILE, "invalid param"); + return SOFTBUS_INVALID_PARAM; } int32_t errCode = SOFTBUS_OK; uint32_t totalLength = 0; @@ -288,7 +288,7 @@ int32_t FileLock(int32_t fd, int32_t type, bool isBlock) { if (fd < 0) { TRANS_LOGE(TRANS_FILE, "[FileLock] invalid file handle"); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } struct flock fl = {0}; fl.l_type = (short)(type == SOFTBUS_F_RDLCK ? F_RDLCK : F_WRLCK); @@ -317,7 +317,7 @@ int32_t TryFileLock(int32_t fd, int32_t type, int32_t retryTimes) SoftBusSleepMs(TRY_LOCK_WAIT_TIME); continue; } else { - return SOFTBUS_ERR; + return SOFTBUS_FILE_ERR; } } return SOFTBUS_FILE_BUSY; @@ -336,7 +336,7 @@ int32_t FileUnLock(int32_t fd) fl.l_len = 0; if (fcntl(fd, F_SETLK, &fl) < 0) { TRANS_LOGE(TRANS_FILE, "unLock file failed, errno=%{public}d", errno); - return SOFTBUS_ERR; + return SOFTBUS_FILE_ERR; } TRANS_LOGE(TRANS_FILE, "unLock file success"); return SOFTBUS_OK; diff --git a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c index b4394a38f8..df447df99a 100644 --- a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c +++ b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c @@ -1542,7 +1542,7 @@ static int32_t UpdateFileReceivePath(int32_t sessionId, FileListener *fileListen if (strcpy_s(fileListener->rootDir, FILE_RECV_ROOT_DIR_SIZE_MAX, absPath) != EOK) { TRANS_LOGE(TRANS_FILE, "failed to strcpy the file receive path"); SoftBusFree(absPath); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } SoftBusFree(absPath); return SOFTBUS_OK; diff --git a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c index 78c8bf7df1..173c0708d3 100644 --- a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c +++ b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c @@ -139,16 +139,16 @@ int32_t ClientTransProxyInit(const IClientSessionCallBack *cb) g_sessionCb = *cb; if (ClinetTransProxyFileManagerInit() != SOFTBUS_OK) { TRANS_LOGE(TRANS_INIT, "ClinetTransProxyFileManagerInit init fail!"); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (ClientTransProxyListInit() != SOFTBUS_OK) { TRANS_LOGE(TRANS_INIT, "ClinetTransProxyListInit init fail!"); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (PendingInit(PENDING_TYPE_PROXY) == SOFTBUS_ERR) { TRANS_LOGE(TRANS_INIT, "trans proxy pending init failed."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftbusGetConfig(SOFTBUS_INT_MAX_BYTES_NEW_LENGTH, @@ -193,8 +193,8 @@ int32_t ClientTransProxyGetInfoByChannelId(int32_t channelId, ProxyChannelInfoDe } (void)SoftBusMutexUnlock(&g_proxyChannelInfoList->lock); - TRANS_LOGE(TRANS_SDK, "can not find proxy channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "can not find proxy channel by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_PROXY_CHANNEL_NOT_FOUND; } int32_t ClientTransProxyAddChannelInfo(ClientProxyChannelInfo *info) @@ -243,8 +243,8 @@ int32_t ClientTransProxyDelChannelInfo(int32_t channelId) } (void)SoftBusMutexUnlock(&g_proxyChannelInfoList->lock); - TRANS_LOGE(TRANS_SDK, "can not find proxy channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "can not find proxy channel by channelId=%{public}d", channelId); + return SOFTBUS_TRANS_PROXY_CHANNEL_NOT_FOUND; } static ClientProxyChannelInfo* ClientTransProxyCreateChannelInfo(const ChannelInfo *channel) @@ -322,13 +322,13 @@ int32_t ClientTransProxySessionDataLenCheck(uint32_t dataLen, SessionPktType typ case TRANS_SESSION_MESSAGE: case TRANS_SESSION_ASYNC_MESSAGE: { if (dataLen > g_proxyMaxMessageBufSize) { - return SOFTBUS_ERR; + return SOFTBUS_TRANS_INVALID_DATA_LENGTH; } break; } case TRANS_SESSION_BYTES: { if (dataLen > g_proxyMaxByteBufSize) { - return SOFTBUS_ERR; + return SOFTBUS_TRANS_INVALID_DATA_LENGTH; } break; } @@ -342,22 +342,23 @@ int32_t ClientTransProxySessionDataLenCheck(uint32_t dataLen, SessionPktType typ static int32_t ClientTransProxyDecryptPacketData(int32_t channelId, int32_t seq, ClientProxyDataInfo *dataInfo) { ProxyChannelInfoDetail info; - if (ClientTransProxyGetInfoByChannelId(channelId, &info) != SOFTBUS_OK) { - return SOFTBUS_ERR; + int32_t ret = ClientTransProxyGetInfoByChannelId(channelId, &info); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "get channel Info by channelId=%{public}d failed, ret=%{public}d", channelId, ret); + return ret; } - AesGcmCipherKey cipherKey = {0}; + AesGcmCipherKey cipherKey = { 0 }; cipherKey.keyLen = SESSION_KEY_LENGTH; if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, info.sessionKey, SESSION_KEY_LENGTH) != EOK) { TRANS_LOGE(TRANS_SDK, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } - int32_t ret = SOFTBUS_ERR; ret = SoftBusDecryptDataWithSeq(&cipherKey, dataInfo->inData, dataInfo->inLen, dataInfo->outData, &(dataInfo->outLen), seq); (void)memset_s(&cipherKey, sizeof(AesGcmCipherKey), 0, sizeof(AesGcmCipherKey)); if (ret != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "trans proxy Decrypt Data fail. ret=%{public}d ", ret); - return SOFTBUS_ERR; + return SOFTBUS_DECRYPT_ERR; } return SOFTBUS_OK; @@ -568,7 +569,7 @@ int32_t TransProxyDelSliceProcessorByChannelId(int32_t channelId) } if (SoftBusMutexLock(&g_channelSliceProcessorList->lock) != 0) { TRANS_LOGE(TRANS_SDK, "lock err"); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } LIST_FOR_EACH_ENTRY_SAFE(node, next, &g_channelSliceProcessorList->list, ChannelSliceProcessor, head) { if (node->channelId == channelId) { @@ -625,7 +626,7 @@ static int32_t ClientTransProxyFirstSliceProcess(SliceProcessor *processor, cons TRANS_LOGE(TRANS_SDK, "memcpy fail when proc first slice package"); SoftBusFree(processor->data); processor->data = NULL; - return SOFTBUS_SLICE_ERROR; + return SOFTBUS_MEM_ERR; } processor->sliceNumber = head->sliceNum; processor->expectedSeq = 1; @@ -809,14 +810,14 @@ static int32_t ClientTransProxyEncryptWithSeq(const char *sessionKey, int32_t se cipherKey.keyLen = SESSION_KEY_LENGTH; if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, sessionKey, SESSION_KEY_LENGTH) != EOK) { TRANS_LOGE(TRANS_SDK, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = SoftBusEncryptDataWithSeq(&cipherKey, (unsigned char*)in, inLen, (unsigned char*)out, outLen, seqNum); (void)memset_s(cipherKey.key, SESSION_KEY_LENGTH, 0, SESSION_KEY_LENGTH); if (ret != SOFTBUS_OK || *outLen != inLen + OVERHEAD_LEN) { - TRANS_LOGE(TRANS_SDK, "encrypt error."); + TRANS_LOGE(TRANS_SDK, "encrypt error, ret=%{public}d", ret); return SOFTBUS_ENCRYPT_ERR; } return SOFTBUS_OK; @@ -887,7 +888,7 @@ int32_t TransProxyPackAndSendData(int32_t channelId, const void *data, uint32_t uint8_t* sliceData = SoftBusMalloc(dataLen + sizeof(SliceHead)); if (sliceData == NULL) { TRANS_LOGE(TRANS_SDK, "malloc slice data error, channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } SliceHead *slicehead = (SliceHead*)sliceData; slicehead->priority = SessionPktTypeToProxyIndex(pktType); @@ -896,14 +897,14 @@ int32_t TransProxyPackAndSendData(int32_t channelId, const void *data, uint32_t ClientPackSliceHead(slicehead); if (memcpy_s(sliceData + sizeof(SliceHead), dataLen, dataInfo.outData + offset, dataLen) != EOK) { TRANS_LOGE(TRANS_SDK, "memcpy_s error, channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = ServerIpcSendMessage(channelId, CHANNEL_TYPE_PROXY, sliceData, dataLen + sizeof(SliceHead), pktType); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ServerIpcSendMessage error, channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "ServerIpcSendMessage error, channelId=%{public}d, ret=%{public}d", channelId, ret); + return ret; } SoftBusFree(sliceData); diff --git a/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_listener.c b/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_listener.c index 0ac9720fbc..e54372ebcc 100644 --- a/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_listener.c +++ b/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_listener.c @@ -64,7 +64,7 @@ static int32_t ClientTdcOnDataEvent(ListenerModule module, int events, int32_t f (void)memset_s(&channel, sizeof(TcpDirectChannelInfo), 0, sizeof(TcpDirectChannelInfo)); if (TransTdcGetInfoByFd(fd, &channel) == NULL) { TRANS_LOGE(TRANS_SDK, "can not match fd. fd=%{public}d", fd); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } if (events == SOFTBUS_SOCKET_IN) { @@ -75,11 +75,11 @@ static int32_t ClientTdcOnDataEvent(ListenerModule module, int events, int32_t f return SOFTBUS_OK; } if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "client process data fail, channelId=%{public}d", channelId); + TRANS_LOGE(TRANS_SDK, "client process data fail, channelId=%{public}d, ret=%{public}d", channelId, ret); TransDelDataBufNode(channelId); TransTdcCloseChannel(channelId); ClientTransTdcOnSessionClosed(channelId, SHUTDOWN_REASON_RECV_DATA_ERR); - return SOFTBUS_ERR; + return ret; } } return SOFTBUS_OK; @@ -91,7 +91,7 @@ int32_t TransTdcCreateListener(int32_t fd) TdcLockInit(); if (SoftBusMutexLock(&g_lock.lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } if (isInitedFlag == false) { isInitedFlag = true; @@ -100,11 +100,11 @@ int32_t TransTdcCreateListener(int32_t fd) .onConnectEvent = ClientTdcOnConnectEvent, .onDataEvent = ClientTdcOnDataEvent, }; - - if (StartBaseClient(DIRECT_CHANNEL_CLIENT, &listener) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "start sdk base listener failed."); + int32_t ret = StartBaseClient(DIRECT_CHANNEL_CLIENT, &listener); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "start sdk base listener failed, ret=%{public}d", ret); SoftBusMutexUnlock(&g_lock.lock); - return SOFTBUS_ERR; + return ret; } TRANS_LOGI(TRANS_SDK, "create sdk listener success."); } diff --git a/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_manager.c b/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_manager.c index a2b9f104c6..7683a101a0 100644 --- a/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_manager.c +++ b/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_manager.c @@ -160,14 +160,14 @@ static int32_t ClientTransCheckTdcChannelExist(int32_t channelId) { if (SoftBusMutexLock(&g_tcpDirectChannelInfoList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } TcpDirectChannelInfo *item = NULL; LIST_FOR_EACH_ENTRY(item, &(g_tcpDirectChannelInfoList->list), TcpDirectChannelInfo, node) { if (item->channelId == channelId) { TRANS_LOGE(TRANS_SDK, "tcp direct already exist. channelId=%{public}d", channelId); (void)SoftBusMutexUnlock(&g_tcpDirectChannelInfoList->lock); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TDC_CHANNEL_ALREADY_EXIST; } } (void)SoftBusMutexUnlock(&g_tcpDirectChannelInfoList->lock); @@ -208,7 +208,7 @@ int32_t ClientTransTdcOnChannelOpened(const char *sessionName, const ChannelInfo { if (sessionName == NULL || channel == NULL) { TRANS_LOGE(TRANS_SDK, "param invalid"); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } if (ClientTransCheckTdcChannelExist(channel->channelId) != SOFTBUS_OK) { return SOFTBUS_ERR; @@ -216,7 +216,7 @@ int32_t ClientTransTdcOnChannelOpened(const char *sessionName, const ChannelInfo TcpDirectChannelInfo *item = TransGetNewTcpChannel(channel); if (item == NULL) { TRANS_LOGE(TRANS_SDK, "get new tcp channel err. channelId=%{public}d", channel->channelId); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } if (TransAddDataBufNode(channel->channelId, channel->fd) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, @@ -262,15 +262,17 @@ int32_t TransTdcManagerInit(const IClientSessionCallBack *callback) g_tcpDirectChannelInfoList = CreateSoftBusList(); if (g_tcpDirectChannelInfoList == NULL || TransDataListInit() != SOFTBUS_OK) { TRANS_LOGE(TRANS_INIT, "init tcp direct channel fail."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } - if (ClientTransTdcSetCallBack(callback) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_INIT, "ClientTransTdcSetCallBack fail."); - return SOFTBUS_ERR; + int32_t ret = ClientTransTdcSetCallBack(callback); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_INIT, "ClientTransTdcSetCallBack fail, ret=%{public}d", ret); + return ret; } - if (PendingInit(PENDING_TYPE_DIRECT) == SOFTBUS_ERR) { - TRANS_LOGE(TRANS_INIT, "trans direct pending init failed."); - return SOFTBUS_ERR; + ret = PendingInit(PENDING_TYPE_DIRECT); + if (ret == SOFTBUS_ERR) { + TRANS_LOGE(TRANS_INIT, "trans direct pending init failed, ret=%{public}d", ret); + return SOFTBUS_NO_INIT; } TRANS_LOGE(TRANS_INIT, "init tcp direct channel success."); return SOFTBUS_OK; @@ -302,7 +304,7 @@ int32_t TransTdcGetSessionKey(int32_t channelId, char *key, unsigned int len) TcpDirectChannelInfo channel; if (TransTdcGetInfoById(channelId, &channel) == NULL) { TRANS_LOGE(TRANS_SDK, "get tdc info failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND; } if (memcpy_s(key, len, channel.detail.sessionKey, SESSION_KEY_LENGTH) != EOK) { TRANS_LOGE(TRANS_SDK, "copy session key failed."); @@ -320,7 +322,7 @@ int32_t TransTdcGetHandle(int32_t channelId, int *handle) TcpDirectChannelInfo channel; if (TransTdcGetInfoById(channelId, &channel) == NULL) { TRANS_LOGE(TRANS_SDK, "get tdc info failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND; } *handle = channel.detail.fd; return SOFTBUS_OK; @@ -331,7 +333,7 @@ int32_t TransDisableSessionListener(int32_t channelId) TcpDirectChannelInfo channel; if (TransTdcGetInfoById(channelId, &channel) == NULL) { TRANS_LOGE(TRANS_SDK, "get tdc info failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND; } if (channel.detail.fd < 0) { TRANS_LOGE(TRANS_SDK, "invalid handle."); diff --git a/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_message.c b/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_message.c index 53158f4f4e..74cfc9e0f6 100644 --- a/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_message.c +++ b/sdk/transmission/trans_channel/tcp_direct/src/client_trans_tcp_direct_message.c @@ -75,7 +75,7 @@ static int32_t TransTdcDecrypt(const char *sessionKey, const char *in, uint32_t cipherKey.keyLen = SESSION_KEY_LENGTH; // 256 bit encryption if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, sessionKey, SESSION_KEY_LENGTH) != EOK) { TRANS_LOGE(TRANS_SDK, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int32_t ret = SoftBusDecryptData(&cipherKey, (unsigned char*)in, inLen, (unsigned char*)out, outLen); (void)memset_s(&cipherKey, sizeof(AesGcmCipherKey), 0, sizeof(AesGcmCipherKey)); @@ -93,7 +93,7 @@ static int32_t TransTdcEncryptWithSeq(const char *sessionKey, int32_t seqNum, co cipherKey.keyLen = SESSION_KEY_LENGTH; if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, sessionKey, SESSION_KEY_LENGTH) != EOK) { TRANS_LOGE(TRANS_SDK, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = SoftBusEncryptDataWithSeq(&cipherKey, (unsigned char*)in, inLen, (unsigned char*)out, outLen, seqNum); if (memset_s(&cipherKey, sizeof(AesGcmCipherKey), 0, sizeof(AesGcmCipherKey)) != EOK) { @@ -101,7 +101,7 @@ static int32_t TransTdcEncryptWithSeq(const char *sessionKey, int32_t seqNum, co return SOFTBUS_MEM_ERR; } if (ret != SOFTBUS_OK || *outLen != inLen + OVERHEAD_LEN) { - TRANS_LOGE(TRANS_SDK, "encrypt error."); + TRANS_LOGE(TRANS_SDK, "encrypt error, ret=%{public}d", ret); return SOFTBUS_ENCRYPT_ERR; } return SOFTBUS_OK; @@ -259,7 +259,7 @@ static int32_t TransTdcSendAck(const TcpDirectChannelInfo *channel, int32_t seq) { if (channel == NULL) { TRANS_LOGE(TRANS_SDK, "channel is null."); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } return TransTdcProcessPostData(channel, (char*)(&seq), ACK_SIZE, FLAG_ACK); @@ -286,12 +286,12 @@ int32_t TransAddDataBufNode(int32_t channelId, int32_t fd) { if (g_tcpDataList == NULL) { TRANS_LOGE(TRANS_SDK, "g_tcpDataList is null."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } ClientDataBuf *node = (ClientDataBuf *)SoftBusCalloc(sizeof(ClientDataBuf)); if (node == NULL) { TRANS_LOGE(TRANS_SDK, "calloc failed."); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } node->channelId = channelId; node->fd = fd; @@ -300,7 +300,7 @@ int32_t TransAddDataBufNode(int32_t channelId, int32_t fd) if (node->data == NULL) { SoftBusFree(node); TRANS_LOGE(TRANS_SDK, "calloc data failed."); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } node->w = node->data; @@ -308,7 +308,7 @@ int32_t TransAddDataBufNode(int32_t channelId, int32_t fd) TRANS_LOGE(TRANS_SDK, "lock failed."); SoftBusFree(node->data); SoftBusFree(node); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ListAdd(&g_tcpDataList->list, &node->node); TRANS_LOGI(TRANS_SDK, "add channelId=%{public}d", channelId); @@ -320,12 +320,12 @@ int32_t TransAddDataBufNode(int32_t channelId, int32_t fd) int32_t TransDelDataBufNode(int32_t channelId) { if (g_tcpDataList == NULL) { - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&g_tcpDataList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ClientDataBuf *item = NULL; ClientDataBuf *next = NULL; @@ -347,12 +347,12 @@ int32_t TransDelDataBufNode(int32_t channelId) static int32_t TransDestroyDataBuf(void) { if (g_tcpDataList == NULL) { - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&g_tcpDataList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ClientDataBuf *item = NULL; ClientDataBuf *next = NULL; @@ -463,7 +463,7 @@ static int32_t TransResizeDataBuffer(ClientDataBuf *oldBuf, uint32_t pkgLen) char *newBuf = (char *)SoftBusCalloc(pkgLen); if (newBuf == NULL) { TRANS_LOGE(TRANS_SDK, "malloc err pkgLen=%{public}u", pkgLen); - return SOFTBUS_MEM_ERR; + return SOFTBUS_MALLOC_ERR; } uint32_t bufLen = oldBuf->w - oldBuf->data; if (memcpy_s(newBuf, pkgLen, oldBuf->data, bufLen) != EOK) { @@ -540,17 +540,17 @@ static int32_t TransClientGetTdcDataBufByChannel(int32_t channelId, int32_t *fd, { if (fd == NULL || len == NULL) { TRANS_LOGE(TRANS_SDK, "invalid param."); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } if (g_tcpDataList == NULL) { TRANS_LOGE(TRANS_SDK, "tdc data list empty."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&g_tcpDataList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ClientDataBuf *item = NULL; LIST_FOR_EACH_ENTRY(item, &(g_tcpDataList->list), ClientDataBuf, node) { @@ -563,22 +563,22 @@ static int32_t TransClientGetTdcDataBufByChannel(int32_t channelId, int32_t *fd, } (void)SoftBusMutexUnlock(&g_tcpDataList->lock); TRANS_LOGE(TRANS_SDK, "client get tdc data buf not found. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND; } static int32_t TransClientUpdateTdcDataBufWInfo(int32_t channelId, char *recvBuf, int32_t recvLen) { if (recvBuf == NULL) { TRANS_LOGE(TRANS_SDK, "invalid param."); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } if (g_tcpDataList == NULL) { TRANS_LOGE(TRANS_SDK, "data list empty."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&g_tcpDataList->lock) != SOFTBUS_OK) { TRANS_LOGE(TRANS_SDK, "lock failed."); - return SOFTBUS_ERR; + return SOFTBUS_LOCK_ERR; } ClientDataBuf *item = NULL; @@ -592,12 +592,12 @@ static int32_t TransClientUpdateTdcDataBufWInfo(int32_t channelId, char *recvBuf (void)SoftBusMutexUnlock(&g_tcpDataList->lock); TRANS_LOGE(TRANS_SDK, "client tdc recvLen override freeLen. recvLen=%{public}d, freeLen=%{public}d", recvLen, freeLen); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_INVALID_DATA_LENGTH; } if (memcpy_s(item->w, recvLen, recvBuf, recvLen) != EOK) { (void)SoftBusMutexUnlock(&g_tcpDataList->lock); TRANS_LOGE(TRANS_SDK, "client tdc memcpy failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } item->w += recvLen; (void)SoftBusMutexUnlock(&g_tcpDataList->lock); @@ -606,42 +606,44 @@ static int32_t TransClientUpdateTdcDataBufWInfo(int32_t channelId, char *recvBuf } (void)SoftBusMutexUnlock(&g_tcpDataList->lock); TRANS_LOGE(TRANS_SDK, "client update tdc data buf not found. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND; } int32_t TransTdcRecvData(int32_t channelId) { int32_t fd = -1; size_t len = 0; - if (TransClientGetTdcDataBufByChannel(channelId, &fd, &len) != SOFTBUS_OK) { - return SOFTBUS_ERR; + int32_t ret = TransClientGetTdcDataBufByChannel(channelId, &fd, &len); + if (ret != SOFTBUS_OK) { + TRANS_LOGE(TRANS_SDK, "get Tdc data buf by channelId=%{public}d failed, ret=%{public}d", channelId, ret); + return ret; } if (len == 0 || len > g_dataBufferMaxLen) { TRANS_LOGE(TRANS_SDK, "client tdc free databuf len invalid. channelId=%{public}d, len=%{public}zu", channelId, len); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_INVALID_DATA_LENGTH; } char *recvBuf = (char*)SoftBusCalloc(len); if (recvBuf == NULL) { TRANS_LOGE(TRANS_SDK, "client tdc calloc failed. channelId=%{public}d, len=%{public}zu", channelId, len); - return SOFTBUS_ERR; + return SOFTBUS_MALLOC_ERR; } int32_t recvLen = ConnRecvSocketData(fd, recvBuf, len, 0); if (recvLen < 0) { SoftBusFree(recvBuf); TRANS_LOGE(TRANS_SDK, "client recv data failed, channelId=%{public}d, recvLen=%{public}d.", channelId, recvLen); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_TCP_GET_SRV_DATA_FAILED; } else if (recvLen == 0) { SoftBusFree(recvBuf); return SOFTBUS_DATA_NOT_ENOUGH; } - - if (TransClientUpdateTdcDataBufWInfo(channelId, recvBuf, recvLen) != SOFTBUS_OK) { + ret = TransClientUpdateTdcDataBufWInfo(channelId, recvBuf, recvLen); + if (ret != SOFTBUS_OK) { SoftBusFree(recvBuf); - TRANS_LOGE(TRANS_SDK, "client update data buf failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "client update data buf failed. channelId=%{public}d, ret=%{public}d", channelId, ret); + return ret; } SoftBusFree(recvBuf); diff --git a/sdk/transmission/trans_channel/udp/common/src/client_trans_udp_manager.c b/sdk/transmission/trans_channel/udp/common/src/client_trans_udp_manager.c index e8f89fae4e..cb70b1f595 100644 --- a/sdk/transmission/trans_channel/udp/common/src/client_trans_udp_manager.c +++ b/sdk/transmission/trans_channel/udp/common/src/client_trans_udp_manager.c @@ -36,7 +36,7 @@ static int32_t ClientTransAddUdpChannel(UdpChannel *channel) { if (g_udpChannelMgr == NULL) { TRANS_LOGE(TRANS_INIT, "udp channel manager hasn't init."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (channel == NULL) { @@ -54,7 +54,7 @@ static int32_t ClientTransAddUdpChannel(UdpChannel *channel) TRANS_LOGE(TRANS_SDK, "udp channel has exited.channelId=%{public}d.", channel->channelId); (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_UDP_CHANNEL_ALREADY_EXIST; } } ListInit(&(channel->node)); @@ -70,7 +70,7 @@ int32_t TransDeleteUdpChannel(int32_t channelId) { if (g_udpChannelMgr == NULL) { TRANS_LOGE(TRANS_INIT, "udp channel manager hasn't init."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&(g_udpChannelMgr->lock)) != 0) { TRANS_LOGE(TRANS_SDK, "lock failed"); @@ -90,14 +90,14 @@ int32_t TransDeleteUdpChannel(int32_t channelId) } (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); TRANS_LOGE(TRANS_SDK, "udp channel not found, channelId=%{public}d.", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND; } int32_t TransGetUdpChannel(int32_t channelId, UdpChannel *channel) { if (g_udpChannelMgr == NULL) { TRANS_LOGE(TRANS_INIT, "udp channel manager hasn't init."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (channel == NULL) { TRANS_LOGE(TRANS_INIT, "param invalid"); @@ -122,14 +122,14 @@ int32_t TransGetUdpChannel(int32_t channelId, UdpChannel *channel) } (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); TRANS_LOGE(TRANS_SDK, "udp channel not found, channelId=%{public}d.", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND; } static int32_t TransSetUdpChannelEnable(int32_t channelId, bool isEnable) { if (g_udpChannelMgr == NULL) { TRANS_LOGE(TRANS_SDK, "udp channel manager hasn't init."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&(g_udpChannelMgr->lock)) != 0) { @@ -147,7 +147,7 @@ static int32_t TransSetUdpChannelEnable(int32_t channelId, bool isEnable) } (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); TRANS_LOGE(TRANS_SDK, "udp channel not found, channelId=%{public}d.", channelId); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND; } static int32_t OnUdpChannelOpened(int32_t channelId) @@ -155,17 +155,17 @@ static int32_t OnUdpChannelOpened(int32_t channelId) UdpChannel channel; if (memset_s(&channel, sizeof(UdpChannel), 0, sizeof(UdpChannel)) != EOK) { TRANS_LOGE(TRANS_SDK, "on udp channel opened memset failed."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = TransGetUdpChannel(channelId, &channel); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get udp failed. channelId=%{public}d", channelId); - return ret; + TRANS_LOGE(TRANS_SDK, "get udp failed. channelId=%{public}d, ret=%{public}d", channelId, ret); + return SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED; } ret = TransSetUdpChannelEnable(channelId, true); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "set udp enable failed. channelId=%{public}d", channelId); - return ret; + TRANS_LOGE(TRANS_SDK, "set udp enable failed. channelId=%{public}d, ret=%{public}d", channelId, ret); + return SOFTBUS_TRANS_UDP_SET_CHANNEL_FAILED; } SessionType type = TYPE_BUTT; switch (channel.businessType) { @@ -177,7 +177,7 @@ static int32_t OnUdpChannelOpened(int32_t channelId) break; default: TRANS_LOGE(TRANS_SDK, "unsupport businessType=%{public}d.", channel.businessType); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH; } ChannelInfo info = {0}; info.channelId = channel.channelId; @@ -245,7 +245,7 @@ int32_t TransOnUdpChannelOpened(const char *sessionName, const ChannelInfo *chan TRANS_LOGI(TRANS_SDK, "add new udp channel success, channelId=%{public}d, businessType=%{public}d", newChannel->channelId, newChannel->businessType); - int32_t ret = SOFTBUS_ERR; + int32_t ret = SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH; switch (channel->businessType) { case BUSINESS_TYPE_STREAM: ret = TransOnstreamChannelOpened(channel, udpPort); @@ -286,7 +286,7 @@ static int32_t TransDeleteBusinnessChannel(UdpChannel *channel) break; default: TRANS_LOGE(TRANS_SDK, "unsupport businessType=%{public}d.", channel->businessType); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH; } return SOFTBUS_OK; } @@ -296,7 +296,7 @@ int32_t TransOnUdpChannelOpenFailed(int32_t channelId, int32_t errCode) UdpChannel channel; bool isFind = true; if (TransGetUdpChannel(channelId, &channel) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "get channelId failed. channelId=%{public}d", channelId); + TRANS_LOGE(TRANS_SDK, "get udp channel by channelId=%{public}d failed.", channelId); isFind = false; } if (TransDeleteUdpChannel(channelId) != SOFTBUS_OK) { @@ -333,8 +333,8 @@ static int32_t CloseUdpChannel(int32_t channelId, bool isActive, ShutdownReason (void)memset_s(&channel, sizeof(UdpChannel), 0, sizeof(UdpChannel)); TRANS_LOGI(TRANS_SDK, "close udp channelId=%{public}d.", channelId); if (TransGetUdpChannel(channelId, &channel) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "CloseUdpChannel get channel failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_SDK, "get udp channel by channelId=%{public}d failed.", channelId); + return SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED; } if (TransDeleteUdpChannel(channelId) != SOFTBUS_OK) { @@ -371,8 +371,8 @@ int32_t TransOnUdpChannelQosEvent(int32_t channelId, int32_t eventId, int32_t tv UdpChannel channel; (void)memset_s(&channel, sizeof(UdpChannel), 0, sizeof(UdpChannel)); if (TransGetUdpChannel(channelId, &channel) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_QOS, "get channel failed. channelId=%{public}d", channelId); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_QOS, "get channel by channelId=%{public}d failed.", channelId); + return SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED; } if (g_sessionCb->OnQosEvent != NULL) { g_sessionCb->OnQosEvent(channelId, CHANNEL_TYPE_UDP, eventId, tvCount, tvList); @@ -391,7 +391,7 @@ int32_t TransUdpChannelSendStream(int32_t channelId, const StreamData *data, con UdpChannel channel; (void)memset_s(&channel, sizeof(UdpChannel), 0, sizeof(UdpChannel)); if (TransGetUdpChannel(channelId, &channel) != SOFTBUS_OK) { - TRANS_LOGE(TRANS_STREAM, "get channel failed. channelId=%{public}d", channelId); + TRANS_LOGE(TRANS_STREAM, "get channel by channelId=%{public}d failed.", channelId); return SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED; } if (!channel.isEnable) { @@ -499,7 +499,7 @@ int32_t ClientTransUdpMgrInit(IClientSessionCallBack *callback) } if (callback == NULL) { TRANS_LOGE(TRANS_INIT, "udp channel info manager init failed, calback is null."); - return SOFTBUS_ERR; + return SOFTBUS_INVALID_PARAM; } g_sessionCb = callback; RegisterStreamCb(&g_udpChannelCb); @@ -546,7 +546,7 @@ int32_t TransUdpChannelSendFile(int32_t channelId, const char *sFileList[], cons UdpChannel channel; if (memset_s(&channel, sizeof(UdpChannel), 0, sizeof(UdpChannel)) != EOK) { TRANS_LOGE(TRANS_FILE, "memset failed."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } if (TransGetUdpChannel(channelId, &channel) != SOFTBUS_OK) { return SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED; @@ -562,7 +562,7 @@ int32_t TransGetUdpChannelByFileId(int32_t dfileId, UdpChannel *udpChannel) { if (g_udpChannelMgr == NULL) { TRANS_LOGE(TRANS_INIT, "udp channel manager hasn't init."); - return SOFTBUS_ERR; + return SOFTBUS_NO_INIT; } if (SoftBusMutexLock(&(g_udpChannelMgr->lock)) != 0) { @@ -583,7 +583,7 @@ int32_t TransGetUdpChannelByFileId(int32_t dfileId, UdpChannel *udpChannel) } } (void)SoftBusMutexUnlock(&(g_udpChannelMgr->lock)); - return SOFTBUS_ERR; + return SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND; } void TransUdpDeleteFileListener(const char *sessionName) diff --git a/sdk/transmission/trans_channel/udp/file/src/client_trans_file.c b/sdk/transmission/trans_channel/udp/file/src/client_trans_file.c index d160d29098..3a388ee259 100644 --- a/sdk/transmission/trans_channel/udp/file/src/client_trans_file.c +++ b/sdk/transmission/trans_channel/udp/file/src/client_trans_file.c @@ -281,7 +281,7 @@ static int32_t UpdateFileRecvPath(int32_t channelId, FileListener *fileListener, if (strcpy_s(fileListener->rootDir, FILE_RECV_ROOT_DIR_SIZE_MAX, absPath) != EOK) { TRANS_LOGE(TRANS_SDK, "strcpy rootDir failed"); SoftBusFree(absPath); - return SOFTBUS_ERR; + return SOFTBUS_STRCPY_ERR; } SoftBusFree(absPath); } diff --git a/sdk/transmission/trans_channel/udp/file/src/client_trans_file_listener.c b/sdk/transmission/trans_channel/udp/file/src/client_trans_file_listener.c index e1fc04b1ef..802eb50913 100644 --- a/sdk/transmission/trans_channel/udp/file/src/client_trans_file_listener.c +++ b/sdk/transmission/trans_channel/udp/file/src/client_trans_file_listener.c @@ -86,7 +86,7 @@ int32_t TransSetFileReceiveListener(const char *sessionName, recvListener, sizeof(IFileReceiveListener)) != EOK) { (void)SoftBusMutexUnlock(&(g_fileListener->lock)); TRANS_LOGE(TRANS_FILE, "update file receive listener failed"); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&(g_fileListener->lock)); TRANS_LOGI(TRANS_FILE, "update file receive listener success"); @@ -105,10 +105,10 @@ int32_t TransSetFileReceiveListener(const char *sessionName, TRANS_LOGE(TRANS_FILE, "file node copy failed."); SoftBusFree(fileNode); (void)SoftBusMutexUnlock(&(g_fileListener->lock)); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } ListAdd(&(g_fileListener->list), &(fileNode->node)); - TRANS_LOGI(TRANS_FILE, "add sessionName = %{public}s", sessionName); + TRANS_LOGI(TRANS_FILE, "add sessionName=%{public}s", sessionName); (void)SoftBusMutexUnlock(&(g_fileListener->lock)); return SOFTBUS_OK; } @@ -135,8 +135,8 @@ int32_t TransSetFileSendListener(const char *sessionName, const IFileSendListene if (memcpy_s(&(fileNode->sendListener), sizeof(IFileSendListener), sendListener, sizeof(IFileSendListener)) != EOK) { (void)SoftBusMutexUnlock(&(g_fileListener->lock)); - TRANS_LOGE(TRANS_FILE, "update file send listener failed"); - return SOFTBUS_ERR; + TRANS_LOGE(TRANS_FILE, "memcpy_s file send listener failed"); + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&(g_fileListener->lock)); TRANS_LOGE(TRANS_FILE, "update file send listener success"); @@ -154,7 +154,7 @@ int32_t TransSetFileSendListener(const char *sessionName, const IFileSendListene TRANS_LOGE(TRANS_FILE, "file node copy failed."); SoftBusFree(fileNode); (void)SoftBusMutexUnlock(&(g_fileListener->lock)); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } ListAdd(&(g_fileListener->list), &(fileNode->node)); TRANS_LOGI(TRANS_FILE, "add sessionName = %{public}s", sessionName); @@ -252,9 +252,9 @@ int32_t TransGetFileListener(const char *sessionName, FileListener *fileListener LIST_FOR_EACH_ENTRY(fileNode, &(g_fileListener->list), FileListener, node) { if (strcmp(fileNode->mySessionName, sessionName) == 0) { if (memcpy_s(fileListener, sizeof(FileListener), fileNode, sizeof(FileListener)) != EOK) { - TRANS_LOGE(TRANS_FILE, "memcpy_s failed."); + TRANS_LOGE(TRANS_FILE, "memcpy_s file listener failed."); (void)SoftBusMutexUnlock(&(g_fileListener->lock)); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } (void)SoftBusMutexUnlock(&(g_fileListener->lock)); return SOFTBUS_OK; diff --git a/sdk/transmission/trans_channel/udp/stream/adaptor/src/client_trans_udp_stream_interface.cpp b/sdk/transmission/trans_channel/udp/stream/adaptor/src/client_trans_udp_stream_interface.cpp index d36ad41de9..16897a27fe 100644 --- a/sdk/transmission/trans_channel/udp/stream/adaptor/src/client_trans_udp_stream_interface.cpp +++ b/sdk/transmission/trans_channel/udp/stream/adaptor/src/client_trans_udp_stream_interface.cpp @@ -107,7 +107,7 @@ int32_t SendVtpStream(int32_t channelId, const StreamData *inData, const StreamD int32_t ret = memcpy_s(data.buffer.get(), data.bufLen, inData->buf, inData->bufLen); if (ret != EOK) { TRANS_LOGE(TRANS_STREAM, "Failed to memcpy data! ret=%{public}d", ret); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } if (ext != nullptr && ext->bufLen > 0) { data.extBuffer = std::make_unique(ext->bufLen); @@ -115,7 +115,7 @@ int32_t SendVtpStream(int32_t channelId, const StreamData *inData, const StreamD ret = memcpy_s(data.extBuffer.get(), data.extLen, ext->buf, ext->bufLen); if (ret != EOK) { TRANS_LOGE(TRANS_STREAM, "Failed to memcpy ext! ret=%{public}d", ret); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } } diff --git a/sdk/transmission/trans_channel/udp/stream/adaptor/src/stream_adaptor.cpp b/sdk/transmission/trans_channel/udp/stream/adaptor/src/stream_adaptor.cpp index 6419564fb5..c2ff1da4c5 100644 --- a/sdk/transmission/trans_channel/udp/stream/adaptor/src/stream_adaptor.cpp +++ b/sdk/transmission/trans_channel/udp/stream/adaptor/src/stream_adaptor.cpp @@ -123,7 +123,7 @@ ssize_t StreamAdaptor::Encrypt(const void *in, ssize_t inLen, void *out, ssize_t cipherKey.keyLen = SESSION_KEY_LENGTH; if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, sessionKey.first, sessionKey.second) != EOK) { TRANS_LOGE(TRANS_STREAM, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = SoftBusEncryptData(&cipherKey, reinterpret_cast(in), inLen, @@ -150,7 +150,7 @@ ssize_t StreamAdaptor::Decrypt(const void *in, ssize_t inLen, void *out, ssize_t cipherKey.keyLen = SESSION_KEY_LENGTH; // 256 bit encryption if (memcpy_s(cipherKey.key, SESSION_KEY_LENGTH, sessionKey.first, sessionKey.second) != EOK) { TRANS_LOGE(TRANS_STREAM, "memcpy key error."); - return SOFTBUS_ERR; + return SOFTBUS_MEM_ERR; } int ret = SoftBusDecryptData(&cipherKey, reinterpret_cast(in), inLen, reinterpret_cast(out), reinterpret_cast(&outLen)); diff --git a/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/trans_channel_manager_test.cpp b/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/trans_channel_manager_test.cpp index 125e553c5e..c6a832b40f 100644 --- a/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/trans_channel_manager_test.cpp +++ b/tests/core/transmission/trans_channel/manager/trans_channel_manager_test/trans_channel_manager_test.cpp @@ -122,7 +122,7 @@ HWTEST_F(TransChannelManagerTest, CopyAppInfoFromSessionParam001, TestSize.Level (void)memcpy_s(appInfo->peerData.deviceId, DEVICE_ID_SIZE_MAX, "test", DEVICE_ID_SIZE_MAX); int32_t ret = CopyAppInfoFromSessionParam(appInfo, sessionParam); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); SoftBusFree(appInfo); SoftBusFree(sessionParam); @@ -396,7 +396,7 @@ HWTEST_F(TransChannelManagerTest, TransRippleStats001, TestSize.Level1) memset_s(trafficStats, sizeof(TrafficStats), 0, sizeof(TrafficStats)); int32_t ret = TransRippleStats(channelId, channelType, trafficStats); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); ret = TransRippleStats(channelId, channelType, NULL); EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); diff --git a/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/trans_lane_manager_test.cpp b/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/trans_lane_manager_test.cpp index d673c77055..ad3c253ad9 100644 --- a/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/trans_lane_manager_test.cpp +++ b/tests/core/transmission/trans_channel/manager/trans_lane_manager_test/trans_lane_manager_test.cpp @@ -145,7 +145,7 @@ HWTEST_F(TransLaneManagerTest, TransLaneMgrAddLane001, TestSize.Level1) TransLaneMgrDeinit(); int32_t ret = TransLaneMgrAddLane(channelId, channelType, connInfo, laneReqId, myData); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); ret = TransLaneMgrInit(); EXPECT_EQ(SOFTBUS_OK, ret); @@ -156,7 +156,7 @@ HWTEST_F(TransLaneManagerTest, TransLaneMgrAddLane001, TestSize.Level1) ret = TransLaneMgrInit(); EXPECT_EQ(SOFTBUS_OK, ret); ret = TransLaneMgrAddLane(channelId, channelType, NULL, laneReqId, myData); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); channelId = 1; channelType = 2; diff --git a/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_manager_test.cpp b/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_manager_test.cpp index 0b8258421b..390233112c 100644 --- a/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_manager_test.cpp +++ b/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_manager_test.cpp @@ -382,7 +382,7 @@ HWTEST_F(SoftbusProxyChannelManagerTest, TransProxyGetSessionKeyByChanIdTest002, channelId = TEST_MESSAGE_CHANNEL_VALID_ID; ret = TransProxyGetSessionKeyByChanId(channelId, sessionKey, sessionKeySize); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); } /** diff --git a/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_message_test.cpp b/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_message_test.cpp index cd875a4ef1..9b39a36df9 100644 --- a/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_message_test.cpp +++ b/tests/core/transmission/trans_channel/proxy_channel/softbus_proxychannel_message_test.cpp @@ -768,7 +768,7 @@ HWTEST_F(SoftbusProxyChannelMessageTest, TransProxyByteDataTest001, TestSize.Lev uint8_t inData = TEST_CHANNEL_IDENTITY_LEN; int32_t ret = TransProxyMessageData(appInfo, dataInfo); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_MEM_ERR, ret); dataInfo->inData = &inData; appInfo->fastTransDataSize = FAST_TRANS_DATASIZE; diff --git a/tests/core/transmission/trans_channel/tcp_direct/unittest/trans_tcp_direct_p2p_test.cpp b/tests/core/transmission/trans_channel/tcp_direct/unittest/trans_tcp_direct_p2p_test.cpp index 259427d15a..e7ce7b4bb4 100644 --- a/tests/core/transmission/trans_channel/tcp_direct/unittest/trans_tcp_direct_p2p_test.cpp +++ b/tests/core/transmission/trans_channel/tcp_direct/unittest/trans_tcp_direct_p2p_test.cpp @@ -132,7 +132,7 @@ string TestGetMsgPack() HWTEST_F(TransTcpDirectP2pTest, StartNewP2pListenerTest001, TestSize.Level1) { int32_t ret = StartNewP2pListener(nullptr, &g_port); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_STRCPY_ERR); ret = StartNewP2pListener(g_ip, &g_port); EXPECT_EQ(ret, SOFTBUS_ERR); @@ -280,7 +280,7 @@ HWTEST_F(TransTcpDirectP2pTest, OnVerifyP2pRequestTest001, TestSize.Level1) HWTEST_F(TransTcpDirectP2pTest, ConnectTcpDirectPeerTest001, TestSize.Level1) { int32_t ret = ConnectTcpDirectPeer(nullptr, g_port); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_STRCPY_ERR); ret = ConnectTcpDirectPeer(g_addr, g_port); EXPECT_EQ(ret, SOFTBUS_ERR); @@ -442,7 +442,7 @@ HWTEST_F(TransTcpDirectP2pTest, StartNewHmlListenerTest001, TestSize.Level1) { ListenerModule moduleType = UNUSE_BUTT; int32_t ret = StartNewHmlListener(nullptr, &g_port, &moduleType); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_STRCPY_ERR); ret = StartNewHmlListener(g_ip, &g_port, &moduleType); EXPECT_EQ(ret, SOFTBUS_ERR); diff --git a/tests/sdk/frame/common/softbus_client_event_manager_test.cpp b/tests/sdk/frame/common/softbus_client_event_manager_test.cpp index 59f2a7027f..2445b362eb 100644 --- a/tests/sdk/frame/common/softbus_client_event_manager_test.cpp +++ b/tests/sdk/frame/common/softbus_client_event_manager_test.cpp @@ -175,7 +175,7 @@ HWTEST_F(SoftbusClientEventManagerTest, DelClientPkgName001, TestSize.Level1) { const char *pkgName = "000"; int32_t ret = InitSoftBus(NULL); - EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); + EXPECT_EQ(SOFTBUS_INVALID_PKGNAME, ret); ret = InitSoftBus(pkgName); EXPECT_EQ(SOFTBUS_OK, ret); @@ -217,7 +217,7 @@ HWTEST_F(SoftbusClientEventManagerTest, CheckPackageName001, TestSize.Level1) ret = AddClientPkgName(pkgName); EXPECT_EQ(SOFTBUS_OK, ret); ret = AddClientPkgName(pkgName); - EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); + EXPECT_EQ(SOFTBUS_INVALID_PKGNAME, ret); DelClientPkgName(pkgName); FreeClientPkgName(); diff --git a/tests/sdk/transmission/session/client_trans_session_callback_test.cpp b/tests/sdk/transmission/session/client_trans_session_callback_test.cpp index 0523860af7..f00f51c787 100644 --- a/tests/sdk/transmission/session/client_trans_session_callback_test.cpp +++ b/tests/sdk/transmission/session/client_trans_session_callback_test.cpp @@ -230,11 +230,11 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest01, TestS EXPECT_EQ(ret, SOFTBUS_OK); const char *sessionName = "com.huawei.devicegroupmanage"; ret = AcceptSessionAsServer(sessionName, channel, TYPE_BUTT, &sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSIONSERVER_NOT_CREATED); SoftBusFree(channel->groupId); channel->groupId = NULL; ret = AcceptSessionAsServer(g_sessionName, channel, TYPE_BUTT, &sessionId); - EXPECT_EQ(ret, SOFTBUS_MEM_ERR); + EXPECT_EQ(ret, SOFTBUS_STRCPY_ERR); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); RelesseChannInfo(channel); @@ -258,7 +258,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest02, TestS ret = GetSessionCallbackByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, &sessionId, NULL); EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = GetSessionCallbackByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, &sessionId, &listener); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusCalloc(sizeof(SessionParam)); @@ -339,7 +339,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest04, TestS ASSERT_EQ(ret, SOFTBUS_OK); channel->channelType = TYPE_BUTT; ret = TransOnSessionOpened(g_sessionName, channel, TYPE_BYTES); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); channel->isServer = true; ret = TransOnSessionOpened(g_sessionName, channel, TYPE_BYTES); EXPECT_EQ(ret, SOFTBUS_OK); @@ -369,7 +369,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest05, TestS ret = ClientAddNewSession(g_sessionName, session); ASSERT_EQ(ret, SOFTBUS_OK); ret = TransOnSessionClosed(INVALID_CHANNEL_ID, CHANNEL_TYPE_BUTT, SHUTDOWN_REASON_UNKNOWN); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); ret = TransOnSessionClosed(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, SHUTDOWN_REASON_UNKNOWN); EXPECT_EQ(ret, SOFTBUS_OK); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); @@ -389,7 +389,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest06, TestS bool isEnabled = false; int32_t ret = ProcessReceivedFileData(TRANS_TEST_SESSION_ID, TRANS_TEST_CHANNEL_ID, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_FIRST_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); ASSERT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusCalloc(sizeof(SessionParam)); @@ -399,7 +399,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest06, TestS ASSERT_EQ(ret, SOFTBUS_OK); ret = ProcessReceivedFileData(sessionId, TRANS_TEST_CHANNEL_ID, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_FIRST_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_NOT_FIND); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); SoftBusFree(sessionParam); @@ -415,7 +415,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest07, TestS { int32_t ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_FIRST_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); ASSERT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusCalloc(sizeof(SessionParam)); @@ -428,19 +428,19 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest07, TestS ASSERT_EQ(ret, SOFTBUS_OK); ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_PROXY, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_FIRST_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_NOT_FIND); ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_PROXY, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_ONGOINE_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_NOT_FIND); ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_PROXY, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_LAST_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_NOT_FIND); ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_PROXY, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_ONLYONE_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_NOT_FIND); ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_PROXY, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_BYTES); @@ -465,7 +465,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest08, TestS StreamData ext = {0}; StreamFrameInfo param = {0}; int32_t ret = TransOnOnStreamRecevied(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, &data, &ext, ¶m); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); ASSERT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusCalloc(sizeof(SessionParam)); @@ -528,7 +528,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest10, TestS ASSERT_TRUE(tvList != NULL); int32_t ret = TransOnQosEvent(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, TRANS_TEST_EVENT_ID, TRANS_TEST_TV_COUNT, tvList); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); ASSERT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusCalloc(sizeof(SessionParam)); @@ -623,7 +623,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest13, TestS { int32_t ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), TRANS_SESSION_FILE_FIRST_FRAME); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); ASSERT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusCalloc(sizeof(SessionParam)); @@ -657,7 +657,7 @@ HWTEST_F(TransClientSessionCallbackTest, TransClientSessionCallbackTest13, TestS ret = TransOnDataReceived(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_UDP, TRANS_TEST_AUTH_DATA, strlen(TRANS_TEST_AUTH_DATA), (SessionPktType)(TRANS_SESSION_FILE_ACK_RESPONSE_SENT + 1)); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_TYPE); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); diff --git a/tests/sdk/transmission/session/client_trans_session_manager_test.cpp b/tests/sdk/transmission/session/client_trans_session_manager_test.cpp index 3ee3ce85d4..d6bf76a3a4 100644 --- a/tests/sdk/transmission/session/client_trans_session_manager_test.cpp +++ b/tests/sdk/transmission/session/client_trans_session_manager_test.cpp @@ -231,7 +231,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest04, TestSiz int32_t ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); ret = ClientDeleteSession(TRANS_TEST_SESSION_ID); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); } @@ -470,7 +470,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest11, TestSiz { int data = 0; int32_t ret = ClientGetSessionIntegerDataById(TRANS_TEST_SESSION_ID, &data, KEY_PEER_PID); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); } /** @@ -519,7 +519,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest13, TestSiz int32_t type = 0; bool isEnable = false; int32_t ret = ClientGetChannelBySessionId(TRANS_TEST_INVALID_SESSION_ID, &channelId, &type, &isEnable); - EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); } /** @@ -538,7 +538,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest14, TestSiz int32_t ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); ret = ClientSetChannelBySessionId(TRANS_TEST_SESSION_ID, transInfo); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); SoftBusFree(transInfo); @@ -606,7 +606,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest17, TestSiz int32_t ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); ret = GetEncryptByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_UDP, &data); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); SessionParam *sessionParam = (SessionParam*)SoftBusMalloc(sizeof(SessionParam)); EXPECT_TRUE(sessionParam != NULL); memset_s(sessionParam, sizeof(SessionParam), 0, sizeof(SessionParam)); @@ -620,7 +620,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest17, TestSiz EXPECT_EQ(ret, SOFTBUS_OK); EXPECT_TRUE(data); ret = GetEncryptByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, &data); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); SoftBusFree(sessionParam); @@ -638,7 +638,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest18, TestSiz int32_t ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); ret = ClientGetSessionIdByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_UDP, &sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); SessionParam *sessionParam = (SessionParam*)SoftBusMalloc(sizeof(SessionParam)); EXPECT_TRUE(sessionParam != NULL); memset_s(sessionParam, sizeof(SessionParam), 0, sizeof(SessionParam)); @@ -670,7 +670,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest19, TestSiz EXPECT_EQ(ret, SOFTBUS_OK); int32_t sessionId = 0; ret = ClientEnableSessionByChannelId(channel, &sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); SessionParam *sessionParam = (SessionParam*)SoftBusMalloc(sizeof(SessionParam)); EXPECT_TRUE(sessionParam != NULL); memset_s(sessionParam, sizeof(SessionParam), 0, sizeof(SessionParam)); @@ -707,7 +707,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest20, TestSiz { ISessionListener sessionlistener = {0}; int32_t ret = ClientGetSessionCallbackById(TRANS_TEST_SESSION_ID, &sessionlistener); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); SessionParam *sessionParam = (SessionParam*)SoftBusMalloc(sizeof(SessionParam)); EXPECT_TRUE(sessionParam != NULL); memset_s(sessionParam, sizeof(SessionParam), 0, sizeof(SessionParam)); @@ -741,7 +741,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest21, TestSiz { ISessionListener sessionlistener = {0}; int32_t ret = ClientGetSessionCallbackByName(g_sessionName, &sessionlistener); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); char pkgName[] = {"dms1"}; @@ -811,11 +811,11 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest22, TestSiz HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest23, TestSize.Level1) { int32_t ret = ClientGrantPermission(TRANS_TEST_INVALID_UID, TRANS_TEST_PID, g_sessionName); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = ClientGrantPermission(TRANS_TEST_UID, TRANS_TEST_INVALID_PID, g_sessionName); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = ClientGrantPermission(TRANS_TEST_UID, TRANS_TEST_PID, NULL); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = ClientRemovePermission(NULL); EXPECT_EQ(ret, SOFTBUS_ERR); } @@ -832,7 +832,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest24, TestSiz int32_t algorithm = 0; int32_t crc = 0; int32_t ret = ClientGetFileConfigInfoById(TRANS_TEST_SESSION_ID, &fileEncrypt, &algorithm, &crc); - EXPECT_EQ(ret, SOFTBUS_NOT_FIND); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); EXPECT_EQ(ret, SOFTBUS_OK); int32_t sessionId = 0; @@ -975,10 +975,10 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionDestroyTest01, TestSiz EXPECT_GT(sessionId, 0); ClientTransOnLinkDown(g_networkId, ROUTE_TYPE_ALL); ret = ClientGetSessionIdByChannelId(TRANS_TEST_CHANNEL_ID + 1, CHANNEL_TYPE_UDP, &sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ClientTransOnLinkDown(g_deviceId, ROUTE_TYPE_ALL); ret = ClientGetSessionIdByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_UDP, &sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); SoftBusFree(sessionParam); @@ -1073,7 +1073,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest29, TestSiz ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); ret = ClientDeleteSession(TRANS_TEST_INVALID_SESSION_ID); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); ret = ClientDeleteSession(TRANS_TEST_SESSION_ID); EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); } @@ -1294,7 +1294,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest41, TestSiz ret = ClientGetFileConfigInfoById(TRANS_TEST_SESSION_ID, &fileEncrypt, &algorithm, NULL); EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = ClientGetFileConfigInfoById(TRANS_TEST_SESSION_ID, &fileEncrypt, &algorithm, &crc); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); ret = CheckPermissionState(TRANS_TEST_SESSION_ID); EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); } @@ -1308,7 +1308,7 @@ HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest41, TestSiz HWTEST_F(TransClientSessionManagerTest, TransClientSessionManagerTest42, TestSize.Level1) { int32_t ret = ReCreateSessionServerToServer(); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); ClientTransOnLinkDown(NULL, ROUTE_TYPE_ALL); ClientTransOnLinkDown(g_networkId, ROUTE_TYPE_ALL); ClientCleanAllSessionWhenServerDeath(); diff --git a/tests/sdk/transmission/session/client_trans_session_service_test.cpp b/tests/sdk/transmission/session/client_trans_session_service_test.cpp index 53b256f1e2..499e30ca88 100644 --- a/tests/sdk/transmission/session/client_trans_session_service_test.cpp +++ b/tests/sdk/transmission/session/client_trans_session_service_test.cpp @@ -156,9 +156,9 @@ HWTEST_F(TransClientSessionServiceTest, TransClientSessionServiceTest01, TestSiz int32_t ret = QosReport(TRANS_TEST_SESSION_ID, APP_TYPE_AUTH, TRANS_TEST_INVALID_QUALITY); EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = QosReport(TRANS_TEST_SESSION_ID, APP_TYPE_AUTH, QOS_IMPROVE); - EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SERVER_NOINIT); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED); ret = OpenSessionSync(NULL, g_sessionName, g_networkId, g_groupid, &g_sessionAttr); - EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_NAME); ret = OpenSessionSync(g_sessionName, NULL, g_networkId, g_groupid, &g_sessionAttr); EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = OpenSessionSync(g_sessionName, g_sessionName, NULL, g_groupid, &g_sessionAttr); diff --git a/tests/sdk/transmission/session/client_trans_session_test.cpp b/tests/sdk/transmission/session/client_trans_session_test.cpp index cb7a1f28b2..fbbaba116a 100644 --- a/tests/sdk/transmission/session/client_trans_session_test.cpp +++ b/tests/sdk/transmission/session/client_trans_session_test.cpp @@ -276,7 +276,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest01, TestSize.Level1) EXPECT_EQ(ret, TRANS_TEST_SESSION_ID); isEnabled = true; ret = OpenSessionWithExistSession(TRANS_TEST_SESSION_ID, isEnabled); - EXPECT_EQ(ret, INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); ret = ClientAddSessionServer(SEC_TYPE_PLAINTEXT, g_pkgName, g_sessionName, &g_sessionlistener); ASSERT_EQ(ret, SOFTBUS_OK); SessionParam *sessionParam = (SessionParam*)SoftBusMalloc(sizeof(SessionParam)); @@ -325,7 +325,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest02, TestSize.Level1) ASSERT_EQ(ret, SOFTBUS_OK); isEnabled = true; ret = OpenSessionWithExistSession(session->sessionId, isEnabled); - EXPECT_EQ(ret, INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); ret = ClientDeleteSessionServer(SEC_TYPE_PLAINTEXT, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); SoftBusFree(sessionParam); @@ -493,9 +493,9 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest08, TestSize.Level1) ASSERT_TRUE(res); data = cJSON_PrintUnformatted(msg); ret = OpenAuthSession(g_sessionName, addrInfoArr, TRANS_TEST_ADDR_INFO_NUM, data); - EXPECT_EQ(ret, INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_SET_CHANNEL_FAILED); ret = ClientDeleteSession(ret); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); ret = RemoveSessionServer(g_pkgName, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); cJSON_free(data); @@ -557,7 +557,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest10, TestSize.Level1) ASSERT_TRUE(session != NULL); session->isEnable = true; ret = CheckSessionIsOpened(TRANS_TEST_CHANNEL_ID); - EXPECT_EQ(ret, SOFTBUS_NOT_FIND); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED); ret = ClientAddNewSession(g_sessionName, session); ASSERT_EQ(ret, SOFTBUS_OK); ret = ClientGetSessionIdByChannelId(TRANS_TEST_CHANNEL_ID, CHANNEL_TYPE_BUTT, &sessionId); @@ -597,7 +597,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest11, TestSize.Level1) EXPECT_EQ(ret, SOFTBUS_OK); CloseSession(sessionId); ret = ClientDeleteSession(sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); session = TestGenerateSession(sessionParam); ASSERT_TRUE(session != NULL); session->channelType = CHANNEL_TYPE_AUTH; @@ -607,7 +607,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest11, TestSize.Level1) EXPECT_EQ(ret, SOFTBUS_OK); CloseSession(sessionId); ret = ClientDeleteSession(sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); ret = RemoveSessionServer(g_pkgName, g_sessionName); EXPECT_EQ(ret, SOFTBUS_OK); SoftBusFree(sessionParam); @@ -796,7 +796,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest19, TestSize.Level1) ASSERT_GT(sessionId, 0); char sessionKey[SESSION_KEY_LEN] = {0}; int32_t ret = GetSessionKey(sessionId, sessionKey, SESSION_KEY_LEN); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND); DeleteSessionServerAndSession(dfsSessionName, sessionId); } @@ -813,7 +813,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest20, TestSize.Level1) ASSERT_GT(sessionId, 0); int handle = 0; int32_t ret = GetSessionHandle(sessionId, &handle); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND); DeleteSessionServerAndSession(dfsSessionName, sessionId); } @@ -829,7 +829,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest21, TestSize.Level1) int32_t sessionId = AddSessionServerAndSession(dfsSessionName, CHANNEL_TYPE_TCP_DIRECT, false); ASSERT_GT(sessionId, 0); int32_t ret = DisableSessionListener(sessionId); - EXPECT_EQ(ret, SOFTBUS_ERR); + EXPECT_EQ(ret, SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND); DeleteSessionServerAndSession(dfsSessionName, sessionId); } @@ -885,7 +885,7 @@ HWTEST_F(TransClientSessionTest, TransClientSessionTest24, TestSize.Level1) EXPECT_EQ(ret, SOFTBUS_INVALID_PARAM); ret = GetSessionOption(TRANS_TEST_SESSION_ID, SESSION_OPTION_MAX_SENDBYTES_SIZE, &optionValue, sizeof(optionValue)); - EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_GET_CHANNEL_FAILED); int32_t sessionId = AddSessionServerAndSession(g_sessionName, CHANNEL_TYPE_TCP_DIRECT, false); ASSERT_GT(sessionId, 0); ret = GetSessionOption(sessionId, SESSION_OPTION_MAX_SENDBYTES_SIZE, diff --git a/tests/sdk/transmission/trans_channel/manager/client_trans_channel_callback_test.cpp b/tests/sdk/transmission/trans_channel/manager/client_trans_channel_callback_test.cpp index b4fcf31fae..b7800e680a 100644 --- a/tests/sdk/transmission/trans_channel/manager/client_trans_channel_callback_test.cpp +++ b/tests/sdk/transmission/trans_channel/manager/client_trans_channel_callback_test.cpp @@ -197,7 +197,7 @@ HWTEST_F(ClientTransChannelCallbackTest, TransOnChannelClosedTest001, TestSize.L EXPECT_EQ(SOFTBUS_OK, ret); ret = TransOnChannelClosed(channelId, CHANNEL_TYPE_UDP, SHUTDOWN_REASON_UNKNOWN); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); ret = TransOnChannelClosed(channelId, CHANNEL_TYPE_TCP_DIRECT, SHUTDOWN_REASON_UNKNOWN); EXPECT_EQ(SOFTBUS_OK, ret); @@ -238,7 +238,7 @@ HWTEST_F(ClientTransChannelCallbackTest, TransOnChannelQosEventTest001, TestSize .type = WIFI_CHANNEL_QUALITY, }; int ret = TransOnChannelQosEvent(channelId, CHANNEL_TYPE_UDP, eventId, tvCount, &tvList); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); ret = TransOnChannelQosEvent(channelId, CHANNEL_TYPE_BUTT, eventId, tvCount, &tvList); EXPECT_EQ(SOFTBUS_TRANS_INVALID_CHANNEL_TYPE, ret); diff --git a/tests/sdk/transmission/trans_channel/manager/client_trans_channel_manager_test.cpp b/tests/sdk/transmission/trans_channel/manager/client_trans_channel_manager_test.cpp index 351ffb0513..2144b3151c 100644 --- a/tests/sdk/transmission/trans_channel/manager/client_trans_channel_manager_test.cpp +++ b/tests/sdk/transmission/trans_channel/manager/client_trans_channel_manager_test.cpp @@ -145,7 +145,7 @@ HWTEST_F(ClientTransChannelManagerTest, ClientTransChannelSendBytesTest001, Test EXPECT_EQ(SOFTBUS_ERR, ret); ret = ClientTransChannelSendBytes(channelId, CHANNEL_TYPE_BUTT, data, TEST_DATA_LENGTH); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_INVALID_CHANNEL_TYPE, ret); } /** diff --git a/tests/sdk/transmission/trans_channel/proxy/client_trans_pending_test.cpp b/tests/sdk/transmission/trans_channel/proxy/client_trans_pending_test.cpp index cb5a1fcc0a..de1d59147c 100644 --- a/tests/sdk/transmission/trans_channel/proxy/client_trans_pending_test.cpp +++ b/tests/sdk/transmission/trans_channel/proxy/client_trans_pending_test.cpp @@ -77,7 +77,7 @@ HWTEST_F(ClientTransPendingTest, TransPendingTest, TestSize.Level0) uint32_t waitMillis = TEST_WAIT_ACK_TIME; ret = GetPendingPacketData(id, seq, waitMillis, true, nullptr); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); TransPendData pendDate = {0}; ret = GetPendingPacketData(TEST_SESSION_ID_SECOND, TEST_SEQ_SECOND, waitMillis, true, &pendDate); diff --git a/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_file_common_test.cpp b/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_file_common_test.cpp index a038e7efd7..e12c455664 100644 --- a/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_file_common_test.cpp +++ b/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_file_common_test.cpp @@ -187,14 +187,14 @@ HWTEST_F(ClientTransProxyFileCommonTest, ClinetTransProxyFilePathTest, TestSize. EXPECT_EQ(true, result); int ret = GetAndCheckRealPath(nullptr, const_cast(g_fileSet1[0])); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); char absPath[PATH_MAX] = {0}; ret = GetAndCheckRealPath(g_fileSet1[0], absPath); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_FILE_ERR, ret); ret = GetAndCheckRealPath(g_fileSet1[2], absPath); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_FILE_ERR, ret); result = CheckDestFilePathValid(nullptr); EXPECT_EQ(false, result); @@ -290,7 +290,7 @@ HWTEST_F(ClientTransProxyFileCommonTest, FileLockTest, TestSize.Level0) EXPECT_EQ(SOFTBUS_FILE_BUSY, ret); ret = TryFileLock(TEST_FD, SOFTBUS_F_RDLCK, TEST_RETRY_TIMES); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_FILE_ERR, ret); ret = TryFileLock(fd, SOFTBUS_F_RDLCK, TEST_RETRY_TIMES); EXPECT_NE(SOFTBUS_OK, ret); diff --git a/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_manager_test.cpp b/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_manager_test.cpp index fdee93966b..2c4038b393 100644 --- a/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_manager_test.cpp +++ b/tests/sdk/transmission/trans_channel/proxy/client_trans_proxy_manager_test.cpp @@ -265,7 +265,7 @@ HWTEST_F(ClientTransProxyManagerTest, ClientTransProxyGetInfoByChannelIdTest, Te EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); ret = ClientTransProxyGetInfoByChannelId(channelId, &info); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_PROXY_CHANNEL_NOT_FOUND, ret); } /** diff --git a/tests/sdk/transmission/trans_channel/qos/trans_qos_stat_client_test.cpp b/tests/sdk/transmission/trans_channel/qos/trans_qos_stat_client_test.cpp index 440cfb766b..a26bd45b5e 100644 --- a/tests/sdk/transmission/trans_channel/qos/trans_qos_stat_client_test.cpp +++ b/tests/sdk/transmission/trans_channel/qos/trans_qos_stat_client_test.cpp @@ -135,7 +135,7 @@ HWTEST_F(TransQosStatClientTest, QosStatClientTest002, TestSize.Level0) StreamFrameInfo tmpf = {}; for (int32_t times = 0; times < sendTimes; times++) { ret = SendStream(sessionId, &d1, &d2, &tmpf); - EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); sleep(1); } EXPECT_EQ(g_qosEventCount[sessionId], 0); @@ -182,7 +182,7 @@ HWTEST_F(TransQosStatClientTest, QosStatClientTest003, TestSize.Level0) StreamFrameInfo tmpf = {}; for (int32_t times = 0; times < sendTimes; times++) { ret = SendStream(sessionId, &d1, &d2, &tmpf); - EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); sleep(1); } EXPECT_EQ(g_qosEventCount[sessionId], 0); @@ -302,7 +302,7 @@ HWTEST_F(TransQosStatClientTest, QosStatClientTest005, TestSize.Level0) d1.bufLen = 1000; for (int32_t times = 0; times < sendTimes; times++) { ret = SendStream(sessionId, &d1, &d2, &tmpf); - EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); sleep(1); } smallSpeed = CalSendBits(g_speedStat[sessionId]) - bigSpeed; @@ -353,7 +353,7 @@ HWTEST_F(TransQosStatClientTest, QosStatClientTest006, TestSize.Level0) StreamFrameInfo tmpf = {}; for (int32_t times = 0; times < sendTimes; times++) { ret = SendStream(sessionId, &d1, &d2, &tmpf); - EXPECT_EQ(ret, SOFTBUS_TRANS_INVALID_SESSION_ID); + EXPECT_EQ(ret, SOFTBUS_TRANS_SESSION_INFO_NOT_FOUND); sleep(1); } bigSpeed = CalSendBits(g_speedStat[sessionId]); diff --git a/tests/sdk/transmission/trans_channel/tcp_direct/trans_tcp_direct_test.cpp b/tests/sdk/transmission/trans_channel/tcp_direct/trans_tcp_direct_test.cpp index 240eb7884d..c8a4cc3850 100644 --- a/tests/sdk/transmission/trans_channel/tcp_direct/trans_tcp_direct_test.cpp +++ b/tests/sdk/transmission/trans_channel/tcp_direct/trans_tcp_direct_test.cpp @@ -365,16 +365,16 @@ HWTEST_F(TransTcpDirectTest, TransClientGetTdcDataBufByChannelTest001, TestSize. size_t len = BUF_LEN; ret = TransClientGetTdcDataBufByChannel(channelId, NULL, NULL); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); ret = TransClientGetTdcDataBufByChannel(channelId, &fd, &len); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_NO_INIT, ret); ret = TransDataListInit(); EXPECT_EQ(SOFTBUS_OK, ret); ret = TransClientGetTdcDataBufByChannel(channelId, &fd, &len); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND, ret); ret = TransAddDataBufNode(channelId, fd); EXPECT_EQ(SOFTBUS_OK, ret); @@ -403,16 +403,16 @@ HWTEST_F(TransTcpDirectTest, TransClientUpdateTdcDataBufWInfoTest001, TestSize.L int recvLen = MAX_LEN; ret = TransClientUpdateTdcDataBufWInfo(channelId, NULL, recvLen); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); ret = TransClientUpdateTdcDataBufWInfo(channelId, const_cast(recvBuf), recvLen); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_NO_INIT, ret); ret = TransDataListInit(); EXPECT_EQ(SOFTBUS_OK, ret); ret = TransClientUpdateTdcDataBufWInfo(channelId, const_cast(recvBuf), recvLen); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_TDC_CHANNEL_NOT_FOUND, ret); ret = TransAddDataBufNode(channelId, fd); EXPECT_EQ(SOFTBUS_OK, ret); @@ -443,7 +443,7 @@ HWTEST_F(TransTcpDirectTest, TransTdcRecvDataTest001, TestSize.Level0) int fd = -1; ret = TransTdcRecvData(channelId); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_NO_INIT, ret); ret = TransDataListInit(); ASSERT_EQ(ret, SOFTBUS_OK); diff --git a/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_static_test.cpp b/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_static_test.cpp index 6aa1d73bf1..b59e907d8b 100644 --- a/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_static_test.cpp +++ b/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_static_test.cpp @@ -78,11 +78,11 @@ HWTEST_F(ClientTransUdpManagerStaticTest, ClientTransUdpManagerStaticTest001, Te OnQosEvent(TEST_CHANNELID, TEST_EVENT_ID, TEST_COUNT, &tvList); ret = TransDeleteUdpChannel(TEST_CHANNELID); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_NO_INIT, ret); UdpChannel channel; ret = TransGetUdpChannel(TEST_CHANNELID, &channel); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_NO_INIT, ret); ret = ClosePeerUdpChannel(TEST_CHANNELID); EXPECT_EQ(SOFTBUS_ERR, ret); @@ -112,7 +112,7 @@ HWTEST_F(ClientTransUdpManagerStaticTest, ClientTransUdpManagerStaticTest002, Te StreamFrameInfo tmpf = {}; int32_t ret = ClientTransUdpMgrInit(NULL); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_INVALID_PARAM, ret); IClientSessionCallBack *cb = GetClientSessionCb(); ret = ClientTransUdpMgrInit(cb); @@ -150,7 +150,7 @@ HWTEST_F(ClientTransUdpManagerStaticTest, ClientTransAddUdpChannelTest001, TestS ASSERT_EQ(SOFTBUS_OK, ret); ret = ClientTransAddUdpChannel(&udpChannel); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_CHANNEL_ALREADY_EXIST, ret); OnUdpChannelOpened(TEST_CHANNELID); @@ -158,7 +158,7 @@ HWTEST_F(ClientTransUdpManagerStaticTest, ClientTransAddUdpChannelTest001, TestS EXPECT_EQ(SOFTBUS_OK, ret); ret = TransSetUdpChannelEnable(ERR_CHANNELID, false); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND, ret); } /** @@ -187,6 +187,6 @@ HWTEST_F(ClientTransUdpManagerStaticTest, TransDeleteBusinnessChannelTest001, Te channel.businessType = TEST_CHANNELID; ret = TransDeleteBusinnessChannel(&channel); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH, ret); } } // namespace OHOS diff --git a/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_test.cpp b/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_test.cpp index 9eae891737..cfd0bf88d8 100644 --- a/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_test.cpp +++ b/tests/sdk/transmission/trans_channel/udp/common/client_trans_udp_manager_test.cpp @@ -154,7 +154,7 @@ HWTEST_F(ClientTransUdpManagerTest, TransOnUdpChannelOpenedTest002, TestSize.Lev EXPECT_EQ(SOFTBUS_ERR, ret); ret = TransOnUdpChannelClosed(channel.channelId, SHUTDOWN_REASON_UNKNOWN); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); channel.businessType = BUSINESS_TYPE_FILE; ret = TransOnUdpChannelOpened(strSessionName, &channel, &udpPort); @@ -167,7 +167,7 @@ HWTEST_F(ClientTransUdpManagerTest, TransOnUdpChannelOpenedTest002, TestSize.Lev channel.businessType = TEST_COUNT; ret = TransOnUdpChannelOpened(g_sessionName, &channel, &udpPort); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH, ret); } /** @@ -208,7 +208,7 @@ HWTEST_F(ClientTransUdpManagerTest, TransOnUdpChannelOpenedTest003, TestSize.Lev EXPECT_EQ(SOFTBUS_ERR, ret); ret = TransOnUdpChannelQosEvent(TEST_CHANNELID, TEST_EVENT_ID, TEST_COUNT, &tvList); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); channel.businessType = BUSINESS_TYPE_BUTT; ret = TransOnUdpChannelOpenFailed(TEST_CHANNELID, TEST_ERRCODE); @@ -241,7 +241,7 @@ HWTEST_F(ClientTransUdpManagerTest, TransOnUdpChannelClosedTest001, TestSize.Lev { int32_t ret; ret = TransOnUdpChannelClosed(TEST_CHANNELID, SHUTDOWN_REASON_UNKNOWN); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); } /** @@ -255,7 +255,7 @@ HWTEST_F(ClientTransUdpManagerTest, TransOnUdpChannelQosEventTest001, TestSize.L int32_t ret; QosTv tvList; ret = TransOnUdpChannelQosEvent(TEST_CHANNELID, TEST_EVENT_ID, TEST_COUNT, &tvList); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); } /** @@ -268,7 +268,7 @@ HWTEST_F(ClientTransUdpManagerTest, ClientTransCloseUdpChannelTest001, TestSize. { int32_t ret; ret = ClientTransCloseUdpChannel(TEST_CHANNELID, SHUTDOWN_REASON_UNKNOWN); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_GET_CHANNEL_FAILED, ret); } /** @@ -363,11 +363,11 @@ HWTEST_F(ClientTransUdpManagerTest, TransGetUdpChannelByFileIdTest001, TestSize. UdpChannel udpChannel; (void)memset_s(&udpChannel, sizeof(UdpChannel), 0, sizeof(UdpChannel)); ret = TransGetUdpChannelByFileId(TEST_DATA_TYPE, &udpChannel); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_TRANS_UDP_CHANNEL_NOT_FOUND, ret); ClientTransUdpMgrDeinit(); ret = TransGetUdpChannelByFileId(TEST_DATA_TYPE, &udpChannel); - EXPECT_EQ(SOFTBUS_ERR, ret); + EXPECT_EQ(SOFTBUS_NO_INIT, ret); } /** -- Gitee