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

!7371 remove adjugement of whether remote device is online

Browse Source 
Merge pull request !7371 from wuchunbo/master
This commit is contained in:
openharmony_ci 2024-08-23 11:18:21 +00:00 committed by Gitee
commit 827bd9e211
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/connection/wifi_direct_cpp/channel/auth_negotiate_channel.cpp
View File

@ -42,13 +42,6 @@ AuthNegotiateChannel::AuthNegotiateChannel(const AuthHandle &handle)
auto ret = AuthGetDeviceUuid(handle_.authId, remoteUuid, UUID_BUF_LEN);
CONN_CHECK_AND_RETURN_LOGE(ret == SOFTBUS_OK, CONN_WIFI_DIRECT, "auth get device id failed");
remoteDeviceId_ = remoteUuid;
auto remoteNetworkId = WifiDirectUtils::UuidToNetworkId(remoteUuid);
if (WifiDirectUtils::IsRemoteSupportTlv(remoteDeviceId_)) {
if (!WifiDirectUtils::IsDeviceOnline(remoteNetworkId)) {
CONN_LOGI(CONN_WIFI_DIRECT, "diff account");
remoteDeviceId_ = "";
}
}
CONN_LOGI(CONN_WIFI_DIRECT, "remoteDeviceId=%{public}s", WifiDirectAnonymizeDeviceId(remoteDeviceId_).c_str());
}
@ -206,11 +199,9 @@ static void OnAuthDataReceived(AuthHandle handle, const AuthTransData *data)
msg.Unmarshalling(*protocol, input);
bool sameAccount = msg.GetExtraData().empty() || msg.GetExtraData().front();
CONN_LOGI(CONN_WIFI_DIRECT, "sameAccount=%{public}d", sameAccount);
if (type == ProtocolType::TLV) {
if (!WifiDirectUtils::IsDeviceOnline(WifiDirectUtils::UuidToNetworkId(remoteDeviceId)) || !sameAccount) {
CONN_LOGI(CONN_WIFI_DIRECT, "diff account, use remote mac as device id");
remoteDeviceId = msg.GetLinkInfo().GetRemoteBaseMac();
}
if (!sameAccount) {
CONN_LOGI(CONN_WIFI_DIRECT, "diff account, use remote mac as device id");
remoteDeviceId = msg.GetLinkInfo().GetRemoteBaseMac();
}
CONN_LOGI(CONN_WIFI_DIRECT, "msgType=%{public}s", msg.MessageTypeToString().c_str());