Roll forward up to cl/353292511.

cpp/core/internal/client_proxy.cc

@@ -54,9 +54,11 @@ void ClientProxy::Reset() {
 void ClientProxy::StartedAdvertising(
     const std::string& service_id, Strategy strategy,
     const ConnectionListener& listener,
-    absl::Span<proto::connections::Medium> mediums) {
+    absl::Span<proto::connections::Medium> mediums,
+    const ConnectionOptions& advertising_options) {
   MutexLock lock(&mutex_);
   advertising_info_ = {service_id, listener};
+  advertising_options_ = advertising_options;
 }
 
 void ClientProxy::StoppedAdvertising() {
@@ -65,6 +67,7 @@ void ClientProxy::StoppedAdvertising() {
   if (IsAdvertising()) {
     advertising_info_.Clear();
   }
+  // advertising_options_ is purposefully not cleared here.
   ResetLocalEndpointIdIfNeeded();
 }
 
@@ -89,9 +92,11 @@ std::string ClientProxy::GetServiceId() const {
 void ClientProxy::StartedDiscovery(
     const std::string& service_id, Strategy strategy,
     const DiscoveryListener& listener,
-    absl::Span<proto::connections::Medium> mediums) {
+    absl::Span<proto::connections::Medium> mediums,
+    const ConnectionOptions& discovery_options) {
   MutexLock lock(&mutex_);
   discovery_info_ = DiscoveryInfo{service_id, listener};
+  discovery_options_ = discovery_options;
 }
 
 void ClientProxy::StoppedDiscovery() {
@@ -101,6 +106,7 @@ void ClientProxy::StoppedDiscovery() {
     discovered_endpoint_ids_.clear();
     discovery_info_.Clear();
   }
+  // discovery_options_ is purposefully not cleared here.
   ResetLocalEndpointIdIfNeeded();
 }
 
@@ -188,6 +194,11 @@ void ClientProxy::OnConnectionInitiated(const std::string& endpoint_id,
   // Note: we allow devices to connect to an advertiser even after it stops
   // advertising, so no need to check IsAdvertising() here.
   item.connection_listener.initiated_cb(endpoint_id, info);
+
+  if (info.is_incoming_connection) {
+    // Add CancellationFlag for advertisers once encryption succeeds.
+    AddCancellationFlag(endpoint_id);
+  }
 }
 
 void ClientProxy::OnConnectionAccepted(const std::string& endpoint_id) {
@@ -248,6 +259,8 @@ void ClientProxy::OnDisconnected(const std::string& endpoint_id, bool notify) {
     connections_.erase(endpoint_id);
     ResetLocalEndpointIdIfNeeded();
   }
+
+  CancelEndpoint(endpoint_id);
 }
 
 bool ClientProxy::ConnectionStatusMatches(const std::string& endpoint_id,
@@ -443,6 +456,42 @@ bool ClientProxy::RemoteConnectionIsAccepted(std::string endpoint_id) const {
       endpoint_id, ClientProxy::Connection::kRemoteEndpointAccepted);
 }
 
+void ClientProxy::AddCancellationFlag(const std::string& endpoint_id) {
+  auto item = cancellation_flags_.find(endpoint_id);
+  if (item != cancellation_flags_.end()) {
+    return;
+  }
+  cancellation_flags_.emplace(endpoint_id,
+                              std::make_unique<CancellationFlag>());
+}
+
+CancellationFlag* ClientProxy::GetCancellationFlag(
+    const std::string& endpoint_id) {
+  const auto item = cancellation_flags_.find(endpoint_id);
+  if (item == cancellation_flags_.end()) {
+    return default_cancellation_flag_.get();
+  }
+  return item->second.get();
+}
+
+void ClientProxy::CancelEndpoint(const std::string& endpoint_id) {
+  const auto item = cancellation_flags_.find(endpoint_id);
+  if (item == cancellation_flags_.end()) return;
+  item->second->Cancel();
+  cancellation_flags_.erase(item);
+}
+
+void ClientProxy::CancelAllEndpoints() {
+  for (const auto& item : cancellation_flags_) {
+    CancellationFlag* cancellation_flag = item.second.get();
+    if (cancellation_flag->Cancelled()) {
+      continue;
+    }
+    cancellation_flag->Cancel();
+  }
+  cancellation_flags_.clear();
+}
+
 void ClientProxy::OnPayload(const std::string& endpoint_id, Payload payload) {
   MutexLock lock(&mutex_);
 
@@ -493,6 +542,7 @@ void ClientProxy::RemoveAllEndpoints() {
   // endpoint, in the case when this is called from stopAllEndpoints(). For now,
   // just remove without notifying.
   connections_.clear();
+  cancellation_flags_.clear();
   local_endpoint_id_.clear();
 }
 
@@ -521,6 +571,14 @@ void ClientProxy::AppendConnectionStatus(const std::string& endpoint_id,
   }
 }
 
+ConnectionOptions ClientProxy::GetAdvertisingOptions() const {
+  return advertising_options_;
+}
+
+ConnectionOptions ClientProxy::GetDiscoveryOptions() const {
+  return discovery_options_;
+}
+
 }  // namespace connections
 }  // namespace nearby
 }  // namespace location