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

Listen to incoming lan connection on all interfaces.

Browse Source 
PiperOrigin-RevId: 803177100
This commit is contained in:
Francis Tsui
2025-09-04 14:31:15 -07:00
committed by Copybara-Service
parent 6c80cc39e9
commit d25872b2e0
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/nearby_server_socket.cc
+5 -1
View File
@@ -66,7 +66,11 @@ bool NearbyServerSocket::Listen(const std::string& ip_address, int port) {
struct sockaddr_in serv_addr;
serv_addr.sin_family = AF_INET;
serv_addr.sin_port = htons(port);
serv_addr.sin_addr.s_addr = inet_addr(ip_address.c_str());
if (ip_address.empty()) {
serv_addr.sin_addr.s_addr = INADDR_ANY;
} else {
serv_addr.sin_addr.s_addr = inet_addr(ip_address.c_str());
}
if (bind(/*s=*/socket_, /*addr=*/(struct sockaddr*)&serv_addr,
/*namelen=*/sizeof(serv_addr)) == SOCKET_ERROR) {
internal/platform/implementation/windows/wifi_lan_medium.cc
+8 -20
View File
@@ -120,15 +120,6 @@ bool WifiLanMedium::StartAdvertising(const NsdServiceInfo& nsd_service_info) {
absl::flat_hash_map<std::string, std::string> text_records =
nsd_service_info.GetTxtRecords();
// Add IPv4 address in text attributes.
std::vector<std::string> ipv4_addresses = GetIpv4Addresses();
if (!ipv4_addresses.empty()) {
if (ipv4_addresses.size() > 1) {
LOG(WARNING) << "The device has multiple IPv4 addresses.";
}
text_records.insert_or_assign(std::string(kDeviceIpv4), ipv4_addresses[0]);
}
if (NearbyFlags::GetInstance().GetBoolFlag(
nearby::platform::config_package_nearby::nearby_platform_feature::
kEnableBlockingSocket)) {
@@ -525,23 +516,18 @@ ExceptionOr<NsdServiceInfo> WifiLanMedium::GetNsdServiceInformation(
}
// Read IP Address information
std::string ip_address;
ip_address.resize(4);
// Find it from text first
// Use the mDNS resolved IP addresses first. If not available, use the IP
// addresses from TXT record.
std::vector<std::string> ip_address_candidates;
inspectable = properties.TryLookup(L"System.Devices.IPAddress");
if (inspectable != nullptr) {
ip_address_candidates = InspectableReader::ReadStringArray(inspectable);
}
std::string ipv4_address =
nsd_service_info.GetTxtRecord(std::string(kDeviceIpv4));
if (!ipv4_address.empty()) {
ip_address_candidates.push_back(ipv4_address);
} else {
inspectable = properties.TryLookup(L"System.Devices.IPAddress");
if (inspectable == nullptr) {
VLOG(1) << "No IP address property in device information.";
return Exception{Exception::kFailed};
}
ip_address_candidates = InspectableReader::ReadStringArray(inspectable);
}
if (ip_address_candidates.empty()) {
@@ -550,6 +536,8 @@ ExceptionOr<NsdServiceInfo> WifiLanMedium::GetNsdServiceInformation(
}
// Gets 4 bytes string
std::string ip_address;
ip_address.resize(4);
for (std::string& address : ip_address_candidates) {
uint32_t addr = inet_addr(address.data());
if (addr == INADDR_NONE) {
internal/platform/implementation/windows/wifi_lan_server_socket.cc
+3 -3
View File
@@ -190,9 +190,9 @@ bool WifiLanServerSocket::listen() {
return false;
}
if (!server_socket_.Listen(ip_addresses_.front(), port_)) {
LOG(ERROR) << "Failed to listen socket at " << ip_addresses_.front()
<< ":" << port_;
// Listen on all interfaces.
if (!server_socket_.Listen("", port_)) {
LOG(ERROR) << "Failed to listen socket at port:" << port_;
return false;
}