Merge branch 'master' into release to roll forward to cl/341113126.

cpp/platform/api/wifi_lan.h

@@ -124,6 +124,9 @@ class WifiLanMedium {
 
   virtual WifiLanService* FindRemoteService(const std::string& ip_address,
                                             int port) = 0;
+
+  virtual std::pair<std::string, int> GetServiceAddress(
+      const std::string& service_id) = 0;
 };
 
 }  // namespace api

cpp/platform/impl/g3/wifi_lan.cc

@@ -374,6 +374,13 @@ api::WifiLanService* WifiLanMedium::FindRemoteService(
   return env.FindWifiLanService(ip_address, port);
 }
 
+std::pair<std::string, int> WifiLanMedium::GetServiceAddress(
+    const std::string& service_id) {
+  NEARBY_LOGS(INFO) << "G3 WifiLan GetServiceAddress: service_id="
+                    << service_id;
+  return service_.GetServiceAddress();
+}
+
 }  // namespace g3
 }  // namespace nearby
 }  // namespace location

cpp/platform/impl/g3/wifi_lan.h

@@ -232,6 +232,9 @@ class WifiLanMedium : public api::WifiLanMedium {
   api::WifiLanService* FindRemoteService(const std::string& ip_address,
                                          int port) override;
 
+  std::pair<std::string, int> GetServiceAddress(
+      const std::string& service_id) override ABSL_LOCKS_EXCLUDED(mutex_);
+
  private:
   static constexpr int kMaxConcurrentAcceptLoops = 5;
 

cpp/platform/public/wifi_lan.cc

@@ -145,5 +145,10 @@ WifiLanService WifiLanMedium::FindRemoteService(const std::string& ip_address,
   return WifiLanService(impl_->FindRemoteService(ip_address, port));
 }
 
+std::pair<std::string, int> WifiLanMedium::GetServiceAddress(
+    const std::string& service_id) {
+  return impl_->GetServiceAddress(service_id);
+}
+
 }  // namespace nearby
 }  // namespace location

cpp/platform/public/wifi_lan.h

@@ -106,6 +106,7 @@ class WifiLanSocket final {
 class WifiLanMedium final {
  public:
   using Platform = api::ImplementationPlatform;
+
   struct DiscoveredServiceCallback {
     std::function<void(WifiLanService& wifi_lan_service,
                        const std::string& service_id)>
@@ -116,6 +117,7 @@ class WifiLanMedium final {
         service_lost_cb =
             DefaultCallback<WifiLanService&, const std::string&>();
   };
+
   struct ServiceDiscoveryInfo {
     WifiLanService service;
   };
@@ -124,6 +126,7 @@ class WifiLanMedium final {
     std::function<void(WifiLanSocket socket, const std::string& service_id)>
         accepted_cb = DefaultCallback<WifiLanSocket, const std::string&>();
   };
+
   struct AcceptedConnectionInfo {
     WifiLanSocket socket;
   };
@@ -161,6 +164,8 @@ class WifiLanMedium final {
 
   WifiLanService FindRemoteService(const std::string& ip_address, int port);
 
+  std::pair<std::string, int> GetServiceAddress(const std::string& service_id);
+
  private:
   Mutex mutex_;
   std::unique_ptr<api::WifiLanMedium> impl_;