openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-24 09:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!6198 fix: 添加差异化处理

Browse Source 
Merge pull request !6198 from liangjunhao/0522
This commit is contained in:
openharmony_ci 2024-05-22 16:09:32 +00:00 committed by Gitee
commit a50b64680e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/transmission/trans_channel/tcp_direct/src/trans_tcp_direct_p2p.c
View File

@ -508,6 +508,23 @@ static void OutputAnonymizeIpAddress(const char *myIp, const char *peerIp)
TRANS_LOGE(TRANS_CTRL, "StartListener failed, myIp=%{public}s peerIp=%{public}s", anonymizedMyIp, anonymizedPeerIp);
}
static int32_t PackAndSendVerifyP2pRsp(const char *myIp, int32_t myPort, int64_t seq, bool isAuthLink,
AuthHandle authHandle)
{
int32_t ret = SOFTBUS_OK;
char *reply = VerifyP2pPack(myIp, myPort, NULL);
if (reply == NULL) {
SendVerifyP2pFailRsp(authHandle, seq, CODE_VERIFY_P2P, ret, "pack reply failed", isAuthLink);
return SOFTBUS_PARSE_JSON_ERR;
}
ret = SendVerifyP2pRsp(authHandle, MODULE_P2P_LISTEN, MES_FLAG_REPLY, seq, reply, isAuthLink);
cJSON_free(reply);
if (ret != SOFTBUS_OK) {
return ret;
}
return SOFTBUS_OK;
}
static int32_t OnVerifyP2pRequest(AuthHandle authHandle, int64_t seq, const cJSON *json, bool isAuthLink)
{
TRANS_LOGI(TRANS_CTRL, "authId=%{public}" PRId64 ", seq=%{public}" PRId64, authHandle.authId, seq);
@ -536,26 +553,19 @@ static int32_t OnVerifyP2pRequest(AuthHandle authHandle, int64_t seq, const cJSO
"get wifidirectmanager or localip fail", isAuthLink);
return SOFTBUS_WIFI_DIRECT_INIT_FAILED;
}
ret = StartP2pListener(myIp, &myPort);
if (strncmp(myIp, HML_IP_PREFIX, NETWORK_ID_LEN) == 0) {
ret = StartHmlListener(myIp, &myPort);
} else {
ret = StartP2pListener(myIp, &myPort);
}
if (ret != SOFTBUS_OK) {
OutputAnonymizeIpAddress(myIp, peerIp);
SendVerifyP2pFailRsp(authHandle, seq, CODE_VERIFY_P2P, ret, "invalid p2p port", isAuthLink);
return ret;
}
char *reply = VerifyP2pPack(myIp, myPort, NULL);
if (reply == NULL) {
SendVerifyP2pFailRsp(authHandle, seq, CODE_VERIFY_P2P, ret, "pack reply failed", isAuthLink);
return SOFTBUS_PARSE_JSON_ERR;
}
ret = SendVerifyP2pRsp(authHandle, MODULE_P2P_LISTEN, MES_FLAG_REPLY, seq, reply, isAuthLink);
cJSON_free(reply);
if (ret != SOFTBUS_OK) {
return ret;
}
ret = PackAndSendVerifyP2pRsp(myIp, myPort, seq, isAuthLink, authHandle);
TRANS_CHECK_AND_RETURN_RET_LOGE(ret == SOFTBUS_OK, ret, TRANS_CTRL, "fail to send VerifyP2pRsp.");
LaneAddP2pAddressByIp(peerIp, peerPort);
TRANS_LOGD(TRANS_CTRL, "ok");
return SOFTBUS_OK;
}