Roll forward to cl/341113126

Signed-off-by: hai007 <hais@google.com>
This commit is contained in:
hai007
2020-11-06 13:55:36 -08:00
parent 3c698dabc5
commit 67f5942051
23 changed files with 1216 additions and 79 deletions
+7
View File
@@ -360,6 +360,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
+3
View File
@@ -218,6 +218,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;