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

[Nearby Connections][C++] Track bandwidth upgrade mediums for each endpoint (3/4)

Browse Source 
* Fix bandwidth upgrade service ID usage. For instance, no longer use the inaccurate service ID from ClientProxy.
* Add more fine-grained upgraded endpoint tracking using both service IDs and endpoint IDs
* Only "revert" bandwidth-upgrade mediums--for example, stop accepting connections on a server socket--for a service when the last endpoint for that service is finished.

These changes are necessary to support multiple services (e.g., Nearby Share and Phone Hub) and multiple mediums (e.g., WebRTC and WLAN).

PiperOrigin-RevId: 442021257
This commit is contained in:
nohle
2022-04-15 08:29:41 -07:00
committed by Copybara-Service
parent dee3e9cfb4
commit e5fb3a8f11
8 changed files with 335 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/base_bwu_handler.cc
+29 -4
View File
@@ -37,17 +37,42 @@ ByteArray BaseBwuHandler::InitializeUpgradedMediumForEndpoint(
HandleInitializeUpgradedMediumForEndpoint(client, upgrade_service_id,
endpoint_id);
if (!upgrade_path_available_frame.Empty()) {
active_service_ids_.insert(upgrade_service_id);
upgrade_service_id_to_active_endpoint_ids_[upgrade_service_id].insert(
endpoint_id);
}
return upgrade_path_available_frame;
}
void BaseBwuHandler::RevertInitiatorState() {
for (const auto& service_id : active_service_ids_) {
HandleRevertInitiatorStateForService(service_id);
for (const auto& pair : upgrade_service_id_to_active_endpoint_ids_) {
HandleRevertInitiatorStateForService(pair.first);
}
upgrade_service_id_to_active_endpoint_ids_.clear();
}
void BaseBwuHandler::RevertInitiatorState(const std::string& upgrade_service_id,
const std::string& endpoint_id) {
if (!IsInitiatorUpgradeServiceId(upgrade_service_id)) {
NEARBY_LOGS(ERROR)
<< "BaseBwuHandler::RevertInitiatorState: input service ID "
<< upgrade_service_id << " is not an BWU initiator ID; ignoring.";
return;
}
auto it = upgrade_service_id_to_active_endpoint_ids_.find(upgrade_service_id);
if (it == upgrade_service_id_to_active_endpoint_ids_.end() ||
it->second.empty()) {
return;
}
// If the last endpoint for the service has been reverted, alert the specific
// medium handler (child class) to perform any clean-up .
it->second.erase(endpoint_id);
if (it->second.empty()) {
upgrade_service_id_to_active_endpoint_ids_.erase(it);
HandleRevertInitiatorStateForService(upgrade_service_id);
}
active_service_ids_.clear();
}
} // namespace connections