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

Deprecate enable_mdns_ipv6 flag.

Browse Source 
PiperOrigin-RevId: 846835528
This commit is contained in:
Francis Tsui
2025-12-19 12:55:17 -08:00
committed by Copybara-Service
parent 04cbf62afb
commit e8d639028f
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/flags/nearby_platform_feature_flags.h
-4
View File
@@ -61,10 +61,6 @@ constexpr auto kEnableHotspotAddressCandidates =
constexpr auto kEnableIntelPieSdk =
flags::Flag<bool>(kConfigPackage, "45428547", false);
// Enable/Disable use of IPv6 address from mDNS on Windows.
constexpr auto kEnableMdnsIpv6 =
flags::Flag<bool>(kConfigPackage, "45735181", false);
// Enable/Disable new Bluetooth refactor
constexpr auto kEnableNewBluetoothRefactor =
flags::Flag<bool>(kConfigPackage, "45615156", false);
internal/platform/implementation/windows/wifi_lan_medium.cc
+14 -27
View File
@@ -307,37 +307,30 @@ std::unique_ptr<api::WifiLanSocket> WifiLanMedium::ConnectToService(
std::string ipv4_address = remote_service_info.GetIPAddress();
if (!ipv4_address.empty()) {
std::unique_ptr<api::WifiLanSocket> socket = ConnectToService(
{
.address = {ipv4_address.begin(), ipv4_address.end()},
.port = static_cast<uint16_t>(remote_service_info.GetPort()),
},
cancellation_flag);
if (socket != nullptr) {
return socket;
SocketAddress v4_server_address;
if (SocketAddress::FromBytes(v4_server_address, ipv4_address,
remote_service_info.GetPort())) {
std::unique_ptr<api::WifiLanSocket> socket = ConnectToSocket(
v4_server_address, cancellation_flag, kConnectTimeout);
if (socket != nullptr) {
return socket;
}
}
LOG(WARNING) << "Failed to connect to service by IPv4 address";
}
if (!NearbyFlags::GetInstance().GetBoolFlag(
platform::config_package_nearby::nearby_platform_feature::
kEnableMdnsIpv6)) {
return nullptr;
}
std::string ipv6_address = remote_service_info.GetIPv6Address();
if (ipv6_address.empty()) {
return nullptr;
}
SocketAddress server_address;
if (!server_address.FromString(server_address, ipv6_address,
SocketAddress v6_server_address;
if (!SocketAddress::FromString(v6_server_address, ipv6_address,
remote_service_info.GetPort())) {
return nullptr;
}
std::unique_ptr<api::WifiLanSocket> socket =
ConnectToSocket(server_address, cancellation_flag, kConnectTimeout);
ConnectToSocket(v6_server_address, cancellation_flag, kConnectTimeout);
if (socket != nullptr) {
return socket;
}
VLOG(1) << "Failed to connect to service by IPv6 address: " << ipv6_address;
return nullptr;
}
@@ -361,8 +354,7 @@ std::unique_ptr<api::WifiLanSocket> WifiLanMedium::ConnectToSocket(
return nullptr;
}
VLOG(1) << "ConnectToSocket: " << address.ToString();
std::unique_ptr<CancellationFlagListener> connection_cancellation_listener =
nullptr;
std::unique_ptr<CancellationFlagListener> connection_cancellation_listener;
auto wifi_lan_socket = std::make_unique<WifiLanSocket>();
@@ -377,7 +369,8 @@ std::unique_ptr<api::WifiLanSocket> WifiLanMedium::ConnectToSocket(
}
bool result = wifi_lan_socket->Connect(address, timeout);
if (!result) {
LOG(ERROR) << "failed to connect to service.";
LOG(ERROR) << "failed to connect to service using "
<< (address.family() == AF_INET6 ? "IPv6" : "IPv4");
return nullptr;
}
@@ -707,12 +700,6 @@ bool WifiLanMedium::IsConnectableIpAddress(NsdServiceInfo& nsd_service_info,
<< service_address.ToString();
}
}
if (!NearbyFlags::GetInstance().GetBoolFlag(
platform::config_package_nearby::nearby_platform_feature::
kEnableMdnsIpv6)) {
return false;
}
std::string ipv6_address = nsd_service_info.GetIPv6Address();
if (ipv6_address.empty()) {
return false;