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

Rename proto fields of the WifiDirectAuthType and WifiDirectCredentials

Browse Source 
PiperOrigin-RevId: 929682564
This commit is contained in:
hai007
2026-06-10 01:36:23 -07:00
committed by Copybara-Service
parent e205d8a08f
commit a8e604bbe4
17 changed files with 91 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/g3/wifi_direct.cc
+6 -6
View File
@@ -135,12 +135,12 @@ bool WifiDirectMedium::StartWifiDirect(
WifiDirectCredentials* wifi_direct_credentials) {
absl::MutexLock lock(mutex_);
std::string service_name = absl::StrCat("NC-", Prng().NextUint32());
wifi_direct_credentials->SetServiceName(service_name);
std::string device_name = absl::StrCat("NC-", Prng().NextUint32());
wifi_direct_credentials->SetDeviceName(device_name);
std::string pin = absl::StrFormat("%04x", Prng().NextUint32());
wifi_direct_credentials->SetPin(pin);
LOG(INFO) << "G3 StartWifiDirect GO: service_name:" << service_name
LOG(INFO) << "G3 StartWifiDirect GO: device_name:" << device_name
<< ", pin:" << pin;
auto& env = MediumEnvironment::Instance();
@@ -165,13 +165,13 @@ bool WifiDirectMedium::ConnectWifiDirect(
const WifiDirectCredentials& wifi_direct_credentials) {
absl::MutexLock lock(mutex_);
LOG(INFO) << "G3 ConnectWifiDirect : service_name:"
<< wifi_direct_credentials.GetServiceName()
LOG(INFO) << "G3 ConnectWifiDirect : device_name:"
<< wifi_direct_credentials.GetDeviceName()
<< ", pin:" << wifi_direct_credentials.GetPin();
auto& env = MediumEnvironment::Instance();
auto* remote_medium = static_cast<WifiDirectMedium*>(
env.GetWifiDirectMedium(wifi_direct_credentials.GetServiceName(), ""));
env.GetWifiDirectMedium(wifi_direct_credentials.GetDeviceName(), ""));
if (!remote_medium) {
env.UpdateWifiDirectMediumForStartOrConnect(*this, &wifi_direct_credentials,
/*is_go=*/false,
internal/platform/implementation/g3/wifi_direct.h
+1 -1
View File
@@ -185,7 +185,7 @@ class WifiDirectMedium : public api::WifiDirectMedium {
// Returns the supported WifiDirect auth types.
std::vector<WifiDirectAuthType> GetSupportedWifiDirectAuthTypes()
const override {
return {WifiDirectAuthType::WIFI_DIRECT_WITH_PIN};
return {WifiDirectAuthType::WIFI_DIRECT_WITH_DEVICE_NAME};
}
private:
internal/platform/implementation/windows/wifi_direct_medium.cc
+8 -8
View File
@@ -304,13 +304,13 @@ bool WifiDirectMedium::StartWifiDirect(
std::string pin = absl::StrFormat("%04x", prng.NextUint32());
credentials_go_->SetPin(pin);
std::string service_name =
std::string device_name =
absl::StrCat(kServiceNamePrefix, std::to_string(prng.NextUint32()));
credentials_go_->SetServiceName(service_name);
LOG(INFO) << "service_name:pin " << service_name << ":" << pin;
credentials_go_->SetDeviceName(device_name);
LOG(INFO) << "device_name:pin " << device_name << ":" << pin;
// Create Advertiser object
advertiser_ = WiFiDirectServiceAdvertiser(winrt::to_hstring(service_name));
advertiser_ = WiFiDirectServiceAdvertiser(winrt::to_hstring(device_name));
advertisement_status_changed_token_ = advertiser_.AdvertisementStatusChanged(
{this, &WifiDirectMedium::OnAdvertisementStatusChanged});
auto_accept_session_connected_token_ = advertiser_.AutoAcceptSessionConnected(
@@ -572,12 +572,12 @@ bool WifiDirectMedium::ConnectWifiDirect(
}
credentials_gc_ = credentials;
if (credentials_gc_.GetServiceName().empty()) {
LOG(ERROR) << "GC: Service name is empty, return false";
if (credentials_gc_.GetDeviceName().empty()) {
LOG(ERROR) << "GC: Device name is empty, return false";
return false;
}
winrt::hstring device_selector = WiFiDirectService::GetSelector(
winrt::to_hstring(credentials_gc_.GetServiceName()));
winrt::to_hstring(credentials_gc_.GetDeviceName()));
const winrt::param::iterable<winrt::hstring> requested_properties =
winrt::single_threaded_vector<winrt::hstring>({
winrt::to_hstring("System.Devices.WiFiDirectServices.ServiceAddress"),
@@ -762,7 +762,7 @@ bool WifiDirectMedium::DisconnectWifiDirect() {
std::vector<WifiDirectMedium::WifiDirectAuthType>
WifiDirectMedium::GetSupportedWifiDirectAuthTypes() const {
// Windows only supports WifiDirect with Service Discovery, which uses a PIN.
return {WifiDirectAuthType::WIFI_DIRECT_WITH_PIN};
return {WifiDirectAuthType::WIFI_DIRECT_WITH_DEVICE_NAME};
}
} // namespace windows
internal/platform/implementation/windows/wifi_direct_test.cc
+2 -2
View File
@@ -82,7 +82,7 @@ TEST(WifiDirectMedium, DISABLED_ConnectWifiDirect) {
std::cin >> pin;
std::string service_name_with_prefix =
absl::StrCat(kServiceNamePrefix, service_name);
credentials.SetServiceName(service_name_with_prefix);
credentials.SetDeviceName(service_name_with_prefix);
credentials.SetPin(pin);
EXPECT_TRUE(wifi_direct_medium.ConnectWifiDirect(credentials));
@@ -159,7 +159,7 @@ TEST(WifiDirectMedium, DISABLED_WifiDirectConnectToServiceServer) {
std::cin >> pin;
std::string service_name_with_prefix =
absl::StrCat(kServiceNamePrefix, service_name);
credentials.SetServiceName(service_name_with_prefix);
credentials.SetDeviceName(service_name_with_prefix);
credentials.SetPin(pin);
EXPECT_TRUE(wifi_direct_medium.ConnectWifiDirect(credentials));