openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2025-03-07 02:27:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复打开蓝牙认证通道时，数据发送失败的问题`:

Browse Source 
Signed-off-by: breakfei1 <zhangshen6@huawei.com>
This commit is contained in:
breakfei1 2022-11-03 13:20:03 +08:00
parent 6c9388df8b
commit 6cd503d08b
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/transmission/trans_channel/auth/src/trans_auth_manager.c
View File

@ -148,7 +148,7 @@ static int32_t NotifyOpenAuthChannelSuccess(const AppInfo *appInfo, bool isServe
channelInfo.channelId = appInfo->myData.channelId;
channelInfo.peerDeviceId = (char *)appInfo->peerData.deviceId;
channelInfo.peerSessionName = (char *)appInfo->peerData.sessionName;
channelInfo.businessType = appInfo->businessType;
channelInfo.businessType = BUSINESS_TYPE_NOT_CARE;
channelInfo.groupId = (char *)AUTH_GROUP_ID;
channelInfo.sessionKey = (char *)AUTH_SESSION_KEY;
channelInfo.keyLen = strlen(channelInfo.sessionKey) + 1;

2
core/transmission/trans_channel/proxy/src/softbus_proxychannel_listener.c
View File

@ -59,7 +59,7 @@ static int32_t NotifyNormalChannelOpened(int32_t channelId, const AppInfo *appIn
info.encrypt = appInfo->encrypt;
info.algorithm = appInfo->algorithm;
info.crc = appInfo->crc;
info.businessType = appInfo->businessType;
info.businessType = appInfo->appType == APP_TYPE_AUTH ? BUSINESS_TYPE_NOT_CARE : appInfo->businessType;
int32_t ret = SOFTBUS_ERR;
if (appInfo->appType != APP_TYPE_AUTH) {

12
sdk/transmission/session/src/client_trans_message_service.c
View File

@ -78,8 +78,7 @@ int SendBytes(int sessionId, const void *data, unsigned int len)
if (ClientGetChannelBusinessTypeBySessionId(sessionId, &businessType) != SOFTBUS_OK) {
return SOFTBUS_TRANS_INVALID_SESSION_ID;
}
if ((businessType != BUSINESS_TYPE_BYTE) && (businessType != BUSINESS_TYPE_NOT_CARE) &&
(channelType != CHANNEL_TYPE_AUTH)) {
if ((businessType != BUSINESS_TYPE_BYTE) && (businessType != BUSINESS_TYPE_NOT_CARE)) {
SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "BusinessType no match, exp: %d", businessType);
return SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH;
}
@ -118,8 +117,7 @@ int SendMessage(int sessionId, const void *data, unsigned int len)
if (ClientGetChannelBusinessTypeBySessionId(sessionId, &businessType) != SOFTBUS_OK) {
return SOFTBUS_TRANS_INVALID_SESSION_ID;
}
if ((businessType != BUSINESS_TYPE_MESSAGE) && (businessType != BUSINESS_TYPE_NOT_CARE) &&
(channelType != CHANNEL_TYPE_AUTH)) {
if ((businessType != BUSINESS_TYPE_MESSAGE) && (businessType != BUSINESS_TYPE_NOT_CARE)) {
SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "BusinessType no match, exp: %d", businessType);
return SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH;
}
@ -156,8 +154,7 @@ int SendStream(int sessionId, const StreamData *data, const StreamData *ext, con
if (ClientGetChannelBusinessTypeBySessionId(sessionId, &businessType) != SOFTBUS_OK) {
return SOFTBUS_TRANS_INVALID_SESSION_ID;
}
if ((businessType != BUSINESS_TYPE_STREAM) && (businessType != BUSINESS_TYPE_NOT_CARE) &&
(type != CHANNEL_TYPE_AUTH)) {
if ((businessType != BUSINESS_TYPE_STREAM) && (businessType != BUSINESS_TYPE_NOT_CARE)) {
SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "BusinessType no match, exp: %d", businessType);
return SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH;
}
@ -195,8 +192,7 @@ int SendFile(int sessionId, const char *sFileList[], const char *dFileList[], ui
if (ClientGetChannelBusinessTypeBySessionId(sessionId, &businessType) != SOFTBUS_OK) {
return SOFTBUS_TRANS_INVALID_SESSION_ID;
}
if ((businessType != BUSINESS_TYPE_FILE) && (businessType != BUSINESS_TYPE_NOT_CARE) &&
(type != CHANNEL_TYPE_AUTH)) {
if ((businessType != BUSINESS_TYPE_FILE) && (businessType != BUSINESS_TYPE_NOT_CARE)) {
SoftBusLog(SOFTBUS_LOG_TRAN, SOFTBUS_LOG_ERROR, "BusinessType no match, exp: %d", businessType);
return SOFTBUS_TRANS_BUSINESS_TYPE_NOT_MATCH;
}