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

Roll forward to cl/328359974

Browse Source 
Change-Id: Id081e9ee4e78fc51e01992c1f2db3b9e32b3e776
This commit is contained in:
Alexey Polyudov
2020-08-25 11:37:16 -07:00
parent ae277748ce
commit abc1cbf267
114 changed files with 5241 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core_v2/internal/simulation_user.cc
+12 -10
View File
@@ -32,7 +32,7 @@ void SimulationUser::OnConnectionInitiated(const std::string& endpoint_id,
NEARBY_LOG(INFO, "StartAdvertising: initiated_cb called");
discovered_ = DiscoveredInfo{
.endpoint_id = endpoint_id,
.endpoint_name = name_,
.endpoint_info = GetInfo(),
.service_id = service_id_,
};
}
@@ -49,12 +49,12 @@ void SimulationUser::OnConnectionRejected(const std::string& endpoint_id,
}
void SimulationUser::OnEndpointFound(const std::string& endpoint_id,
const std::string& endpoint_name,
const ByteArray& endpoint_info,
const std::string& service_id) {
NEARBY_LOG(INFO, "Device discovered: id=%s", endpoint_id.c_str());
discovered_ = DiscoveredInfo{
.endpoint_id = endpoint_id,
.endpoint_name = endpoint_name,
.endpoint_info = endpoint_info,
.service_id = service_id,
};
if (found_latch_) found_latch_->CountDown();
@@ -111,7 +111,7 @@ void SimulationUser::StartAdvertising(const std::string& service_id,
};
EXPECT_TRUE(mgr_.StartAdvertising(&client_, service_id_, options_,
{
.name = name_,
.endpoint_info = info_,
.listener = std::move(listener),
})
.Ok());
@@ -142,12 +142,14 @@ void SimulationUser::RequestConnection(CountDownLatch* latch) {
.rejected_cb =
absl::bind_front(&SimulationUser::OnConnectionRejected, this),
};
EXPECT_TRUE(mgr_.RequestConnection(&client_, discovered_.endpoint_id,
{
.name = discovered_.endpoint_name,
.listener = std::move(listener),
})
.Ok());
EXPECT_TRUE(
mgr_.RequestConnection(&client_, discovered_.endpoint_id,
{
.endpoint_info = discovered_.endpoint_info,
.listener = std::move(listener),
},
connection_options_)
.Ok());
}
void SimulationUser::AcceptConnection(CountDownLatch* latch) {