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

nearbyconnections : Adds accessor of ServiceType for NsdServiceInfo.

Browse Source 
PiperOrigin-RevId: 404003948
This commit is contained in:
edwinwu
2021-10-18 10:55:45 -07:00
committed by Copybara-Service
parent b6ea14f741
commit 296274bc48
19 changed files with 350 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/platform/public/wifi_lan.cc
+5 -5
View File
@@ -53,7 +53,7 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
"service_info_name=%s",
&context.wifi_lan_service, &wifi_lan_service,
wifi_lan_service.GetServiceInfo()
.GetServiceInfoName()
.GetServiceName()
.c_str());
return;
} else {
@@ -63,7 +63,7 @@ bool WifiLanMedium::StartDiscovery(const std::string& service_id,
"Discovering wifi_lan_service=%p, service_info_name=%s",
&wifi_lan_service,
wifi_lan_service.GetServiceInfo()
.GetServiceInfoName()
.GetServiceName()
.c_str());
}
discovered_service_callback_.service_discovered_cb(
@@ -143,7 +143,7 @@ WifiLanSocket WifiLanMedium::Connect(WifiLanService& wifi_lan_service,
INFO,
"WifiLanMedium::Connect: service=%p [impl=%p, service_info_name=%s]",
&wifi_lan_service, &wifi_lan_service.GetImpl(),
wifi_lan_service.GetServiceInfo().GetServiceInfoName().c_str());
wifi_lan_service.GetServiceInfo().GetServiceName().c_str());
return WifiLanSocket(impl_->Connect(wifi_lan_service.GetImpl(), service_id,
cancellation_flag));
}
@@ -153,9 +153,9 @@ WifiLanService WifiLanMedium::GetRemoteService(const std::string& ip_address,
return WifiLanService(impl_->GetRemoteService(ip_address, port));
}
std::pair<std::string, int> WifiLanMedium::GetServiceAddress(
std::pair<std::string, int> WifiLanMedium::GetCredentials(
const std::string& service_id) {
return impl_->GetServiceAddress(service_id);
return impl_->GetCredentials(service_id);
}
} // namespace nearby
cpp/platform/public/wifi_lan.h
+1 -1
View File
@@ -161,7 +161,7 @@ class WifiLanMedium final {
WifiLanService GetRemoteService(const std::string& ip_address, int port);
std::pair<std::string, int> GetServiceAddress(const std::string& service_id);
std::pair<std::string, int> GetCredentials(const std::string& service_id);
private:
Mutex mutex_;
cpp/platform/public/wifi_lan_test.cc
+11 -13
View File
@@ -73,17 +73,16 @@ TEST_P(WifiLanMediumTest, CanStartAcceptingConnectionsAndConnect) {
.service_discovered_cb =
[&found_latch, &discovered_service](
WifiLanService& service, const std::string& service_id) {
NEARBY_LOG(
INFO, "Service discovered: %s, %p",
service.GetServiceInfo().GetServiceInfoName().c_str(),
&service);
NEARBY_LOG(INFO, "Service discovered: %s, %p",
service.GetServiceInfo().GetServiceName().c_str(),
&service);
discovered_service = &service;
found_latch.CountDown();
},
});
NsdServiceInfo nsd_service_info;
nsd_service_info.SetServiceInfoName(service_info_name);
nsd_service_info.SetServiceName(service_info_name);
nsd_service_info.SetTxtRecord(std::string(kEndpointInfoKey),
endpoint_info_name);
wifi_b.StartAdvertising(service_id, nsd_service_info);
@@ -135,17 +134,16 @@ TEST_P(WifiLanMediumTest, CanCancelConnect) {
.service_discovered_cb =
[&found_latch, &discovered_service](
WifiLanService& service, const std::string& service_id) {
NEARBY_LOG(
INFO, "Service discovered: %s, %p",
service.GetServiceInfo().GetServiceInfoName().c_str(),
&service);
NEARBY_LOG(INFO, "Service discovered: %s, %p",
service.GetServiceInfo().GetServiceName().c_str(),
&service);
discovered_service = &service;
found_latch.CountDown();
},
});
NsdServiceInfo nsd_service_info;
nsd_service_info.SetServiceInfoName(service_info_name);
nsd_service_info.SetServiceName(service_info_name);
nsd_service_info.SetTxtRecord(std::string(kEndpointInfoKey),
endpoint_info_name);
wifi_b.StartAdvertising(service_id, nsd_service_info);
@@ -212,7 +210,7 @@ TEST_F(WifiLanMediumTest, CanStartAdvertising) {
CountDownLatch found_latch(1);
NsdServiceInfo nsd_service_info;
nsd_service_info.SetServiceInfoName(service_info_name);
nsd_service_info.SetServiceName(service_info_name);
nsd_service_info.SetTxtRecord(std::string(kEndpointInfoKey),
endpoint_info_name);
wifi_a.StartAdvertising(service_id, nsd_service_info);
@@ -256,7 +254,7 @@ TEST_F(WifiLanMediumTest, CanStartDiscovery) {
});
NsdServiceInfo nsd_service_info;
nsd_service_info.SetServiceInfoName(service_info_name);
nsd_service_info.SetServiceName(service_info_name);
nsd_service_info.SetTxtRecord(std::string(kEndpointInfoKey),
endpoint_info_name);
EXPECT_TRUE(wifi_b.StartAdvertising(service_id, nsd_service_info));
@@ -292,7 +290,7 @@ TEST_F(WifiLanMediumTest, CanStopDiscovery) {
});
NsdServiceInfo nsd_service_info;
nsd_service_info.SetServiceInfoName(service_info_name);
nsd_service_info.SetServiceName(service_info_name);
nsd_service_info.SetTxtRecord(std::string(kEndpointInfoKey),
endpoint_info_name);