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

Fixed the bug of Laptop unable to detect another Laptop after first attempt

Browse Source 
PiperOrigin-RevId: 487130249
This commit is contained in:
Guogang Li
2022-11-08 21:08:43 -08:00
committed by Copybara-Service
parent 219f9b75e1
commit c9429fcb46
2 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/wifi_lan.cc
+35 -13
View File
@@ -35,7 +35,7 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
DiscoveredServiceCallback callback) {
{
MutexLock lock(&mutex_);
if (discovery_callbacks_.contains(service_type)) {
if (service_type_to_callback_map_.contains(service_type)) {
NEARBY_LOGS(INFO) << "WifiLan Discovery already start with service_type="
<< service_type << "; impl=" << &GetImpl();
return false;
@@ -47,9 +47,9 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
MutexLock lock(&mutex_);
std::string service_type = service_info.GetServiceType();
// Check callback for the service type.
const auto& it = discovery_callbacks_.find(service_type);
const auto& it = service_type_to_callback_map_.find(service_type);
if (it == discovery_callbacks_.end()) {
if (it == service_type_to_callback_map_.end()) {
NEARBY_LOGS(ERROR)
<< "There is no callback found for service_type="
<< service_type;
@@ -57,8 +57,16 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
}
// Check whether service name is in cache.
auto services_it = service_type_to_services_map_.find(service_type);
if (services_it == service_type_to_services_map_.end()) {
NEARBY_LOGS(ERROR)
<< "There is no service map found for service_type="
<< service_type;
return;
}
std::string service_name = service_info.GetServiceName();
auto pair = discovery_services_.insert(service_name);
auto pair = services_it->second.insert(service_name);
if (!pair.second) {
NEARBY_LOGS(INFO)
<< "Discovering (again) service_info=" << &service_info
@@ -82,14 +90,22 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
MutexLock lock(&mutex_);
std::string service_type = service_info.GetServiceType();
std::string service_name = service_info.GetServiceName();
auto item = discovery_services_.extract(service_name);
auto services_it = service_type_to_services_map_.find(service_type);
if (services_it == service_type_to_services_map_.end()) {
NEARBY_LOGS(ERROR)
<< "There is no service map found for service_type="
<< service_type;
return;
}
auto item = services_it->second.extract(service_name);
if (item.empty()) return;
NEARBY_LOGS(INFO) << "Removing service_info=" << &service_info
<< ", service_type=" << service_type
<< ", service_info_name=" << service_name;
// Callback service lost.
const auto& it = discovery_callbacks_.find(service_type);
if (it != discovery_callbacks_.end()) {
const auto& it = service_type_to_callback_map_.find(service_type);
if (it != service_type_to_callback_map_.end()) {
std::string service_id = it->second->service_id;
DiscoveredServiceCallback medium_callback =
it->second->medium_callback;
@@ -100,18 +116,24 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
{
// Insert callback to the map first no matter it succeeds or not.
MutexLock lock(&mutex_);
auto pair = discovery_callbacks_.insert(
auto pair = service_type_to_callback_map_.insert(
{service_type, absl::make_unique<DiscoveryCallbackInfo>()});
auto& context = *pair.first->second;
context.medium_callback = std::move(callback);
context.service_id = service_id;
// Insert an empty services set to track the services under the service
// type.
service_type_to_services_map_.insert(
{service_type, absl::flat_hash_set<std::string>()});
}
bool success = impl_->StartDiscovery(service_type, std::move(api_callback));
if (!success) {
// If failed, then revert back the insertion.
MutexLock lock(&mutex_);
discovery_callbacks_.erase(service_type);
service_type_to_callback_map_.erase(service_type);
service_type_to_services_map_.erase(service_type);
}
NEARBY_LOGS(INFO) << "WifiLan Discovery started for service_type="
<< service_type << ", impl=" << &GetImpl()
@@ -121,12 +143,12 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
bool WifiLanMedium::StopDiscovery(const std::string& service_type) {
MutexLock lock(&mutex_);
if (!discovery_callbacks_.contains(service_type)) {
if (!service_type_to_callback_map_.contains(service_type)) {
return false;
}
discovery_callbacks_.erase(service_type);
if (discovery_services_.contains(service_type)) {
discovery_services_.erase(service_type);
service_type_to_callback_map_.erase(service_type);
if (service_type_to_services_map_.contains(service_type)) {
service_type_to_services_map_.erase(service_type);
}
NEARBY_LOGS(INFO) << "WifiLan Discovery disabled for service_type="
<< service_type << ", impl=" << &GetImpl();
internal/platform/wifi_lan.h
+15 -6
View File
@@ -15,16 +15,20 @@
#ifndef PLATFORM_PUBLIC_WIFI_LAN_H_
#define PLATFORM_PUBLIC_WIFI_LAN_H_
#include <functional>
#include <memory>
#include <string>
#include <utility>
#include "absl/container/flat_hash_map.h"
#include "internal/platform/cancellation_flag.h"
#include "internal/platform/implementation/platform.h"
#include "internal/platform/implementation/wifi_lan.h"
#include "internal/platform/byte_array.h"
#include "internal/platform/cancellation_flag.h"
#include "internal/platform/input_stream.h"
#include "internal/platform/nsd_service_info.h"
#include "internal/platform/output_stream.h"
#include "internal/platform/logging.h"
#include "internal/platform/mutex.h"
#include "internal/platform/nsd_service_info.h"
#include "internal/platform/output_stream.h"
namespace location {
namespace nearby {
@@ -207,9 +211,14 @@ class WifiLanMedium {
private:
Mutex mutex_;
std::unique_ptr<api::WifiLanMedium> impl_;
// Used to keep the map from service type to discovery callback.
absl::flat_hash_map<std::string, std::unique_ptr<DiscoveryCallbackInfo>>
discovery_callbacks_ ABSL_GUARDED_BY(mutex_);
absl::flat_hash_set<std::string> discovery_services_ ABSL_GUARDED_BY(mutex_);
service_type_to_callback_map_ ABSL_GUARDED_BY(mutex_);
// Used to keep the map from service type to services with the type.
absl::flat_hash_map<std::string, absl::flat_hash_set<std::string>>
service_type_to_services_map_ ABSL_GUARDED_BY(mutex_);
};
} // namespace nearby