Merge pull request !6543 from 木子李/cherry-pick-1718189855
This commit is contained in:
openharmony_ci 2024-06-12 13:51:43 +00:00 committed by Gitee
commit 4a8ea9968e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1275,7 +1275,8 @@ static void GuideChannelDetect(uint32_t authRequestId, AuthHandle authHandle)
(void)memset_s(&linkInfo, sizeof(LaneLinkInfo), 0, sizeof(LaneLinkInfo));
if (UpdateP2pLinkInfoWithAuth(authRequestId, authHandle) != SOFTBUS_OK ||
GetWlanInfo(p2pLinkReqInfo.laneRequestInfo.networkId, &linkInfo) != SOFTBUS_OK) {
goto FATL;
AuthChannelDetectSucc(laneReqId, authRequestId, authHandle);
return;
}
LaneLinkCb cb = {
.onLaneLinkSuccess = DetectSuccess,
@ -1285,10 +1286,9 @@ static void GuideChannelDetect(uint32_t authRequestId, AuthHandle authHandle)
LNN_LOGI(LNN_LANE, "auth channel need detect, laneReqId=%{public}u", laneReqId);
if (LaneDetectReliability(laneReqId, &linkInfo, &cb) != SOFTBUS_OK) {
DetectFail(laneReqId, SOFTBUS_LANE_DETECT_FAIL, linkInfo.type);
return;
}
return;
}
FATL:
LNN_LOGI(LNN_LANE, "auth channel no need detect, authRequestId=%{public}u", authRequestId);
AuthChannelDetectSucc(laneReqId, authRequestId, authHandle);
}