TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google3' to roll forward up to cl/353971958.

Browse Source
This commit is contained in:
hai007
2021-01-26 16:05:41 -08:00
parent 39d141ad73 3c68372b55
commit 9aa7ee8c3f
5 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/client_proxy.cc
+26 -4
View File
@@ -153,15 +153,21 @@ void ClientProxy::OnEndpointFound(const std::string& service_id,
endpoint_id.c_str(), service_id.c_str(),
absl::BytesToHexString(endpoint_info.data()).c_str());
if (!IsDiscoveringServiceId(service_id)) {
NEARBY_LOG(INFO, "ClientProxy [Endpoint Found]: [no discovery] id=%s",
NEARBY_LOG(INFO,
"ClientProxy [Endpoint Found]: Ignoring event for id=%s because "
"this client is not discovering",
endpoint_id.c_str());
return;
}
if (discovered_endpoint_ids_.count(endpoint_id)) {
NEARBY_LOG(INFO, "ClientProxy [Endpoint Found]: [duplicate] id=%s",
NEARBY_LOG(WARNING,
"ClientProxy [Endpoint Found]: Ignoring event for id=%s because "
"this client already reported this endpoint as found",
endpoint_id.c_str());
return;
}
discovered_endpoint_ids_.insert(endpoint_id);
discovery_info_.listener.endpoint_found_cb(endpoint_id, endpoint_info,
service_id);
@@ -171,9 +177,25 @@ void ClientProxy::OnEndpointLost(const std::string& service_id,
const std::string& endpoint_id) {
MutexLock lock(&mutex_);
if (!IsDiscoveringServiceId(service_id)) return;
NEARBY_LOG(INFO, "ClientProxy [Endpoint Lost]: [enter] id=%s; service=%s",
endpoint_id.c_str(), service_id.c_str());
if (!IsDiscoveringServiceId(service_id)) {
NEARBY_LOG(INFO,
"ClientProxy [Endpoint Lost]: Ignoring event for id=%s because "
"this client is not discovering",
endpoint_id.c_str());
return;
}
const auto it = discovered_endpoint_ids_.find(endpoint_id);
if (it == discovered_endpoint_ids_.end()) return;
if (it == discovered_endpoint_ids_.end()) {
NEARBY_LOG(WARNING,
"ClientProxy [Endpoint Lost]: Ignoring event for id=%s because "
"this client has not yet reported this endpoint as found",
endpoint_id.c_str());
return;
}
discovered_endpoint_ids_.erase(it);
discovery_info_.listener.endpoint_lost_cb(endpoint_id);
}