TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 07:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an upgrade issue

Browse Source 
PiperOrigin-RevId: 544778015
This commit is contained in:
Guogang Li
2023-06-30 16:44:04 -07:00
committed by Copybara-Service
parent 7a99b5e0a3
commit 92a1510158
2 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/wifi_hotspot.h
+2 -3
View File
@@ -211,9 +211,8 @@ class WifiHotspotServerSocket : public api::WifiHotspotServerSocket {
bool SetupServerSocketWinRT();
bool SetupServerSocketWinSock();
// Retrieves IP addresses from local machine
std::vector<std::string> GetIpAddresses() const;
std::string GetHotspotIpAddresses() const;
// Retrieves hotspot IP address from local machine
std::string GetHotspotIpAddress() const;
mutable absl::Mutex mutex_;
absl::CondVar cond_;
internal/platform/implementation/windows/wifi_hotspot_server_socket.cc
+24 -42
View File
@@ -53,14 +53,11 @@ std::string WifiHotspotServerSocket::GetIPAddress() const {
}
}
if (ip_addresses_.empty()) {
auto ip_addr = GetIpAddresses();
if (ip_addr.empty()) {
return {};
}
return ip_addr.front();
}
return ip_addresses_.front();
std::string hotspot_ip_address = GetHotspotIpAddress();
NEARBY_LOGS(INFO) << __func__
<< ": Return hotspot IP address: " << hotspot_ip_address;
return hotspot_ip_address;
}
int WifiHotspotServerSocket::GetPort() const {
@@ -399,7 +396,7 @@ bool WifiHotspotServerSocket::listen() {
<< ", IP check interval="
<< ip_address_retry_interval_millis << "ms";
for (int i = 0; i < ip_address_max_retries; i++) {
hotspot_ipaddr_ = GetHotspotIpAddresses();
hotspot_ipaddr_ = GetHotspotIpAddress();
if (hotspot_ipaddr_.empty()) {
NEARBY_LOGS(WARNING) << "Failed to find Hotspot's IP addr for the try: "
<< i + 1 << ". Wait "
@@ -425,35 +422,7 @@ bool WifiHotspotServerSocket::listen() {
}
}
std::vector<std::string> WifiHotspotServerSocket::GetIpAddresses() const {
std::vector<std::string> result;
try {
auto host_names = NetworkInformation::GetHostNames();
for (auto host_name : host_names) {
if (host_name.IPInformation() != nullptr &&
host_name.IPInformation().NetworkAdapter() != nullptr &&
host_name.Type() == HostNameType::Ipv4) {
std::string ipv4_s = winrt::to_string(host_name.ToString());
if (absl::EndsWith(ipv4_s, ".1")) {
NEARBY_LOGS(INFO) << "Found Hotspot IP: " << ipv4_s;
result.push_back(ipv4_s);
}
}
}
} catch (std::exception exception) {
NEARBY_LOGS(ERROR) << __func__ << ": Exception: " << exception.what();
} catch (const winrt::hresult_error &error) {
NEARBY_LOGS(ERROR) << __func__ << ": WinRT exception: " << error.code()
<< ": " << winrt::to_string(error.message());
} catch (...) {
NEARBY_LOGS(ERROR) << __func__ << ": Unknown exeption.";
}
return result;
}
std::string WifiHotspotServerSocket::GetHotspotIpAddresses() const {
std::string WifiHotspotServerSocket::GetHotspotIpAddress() const {
try {
int64_t ip_address_max_retries = NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
@@ -461,19 +430,32 @@ std::string WifiHotspotServerSocket::GetHotspotIpAddresses() const {
for (int i = 0; i < ip_address_max_retries; i++) {
auto host_names = NetworkInformation::GetHostNames();
std::vector<std::string> ip_candidates;
for (auto host_name : host_names) {
if (host_name.IPInformation() != nullptr &&
host_name.IPInformation().NetworkAdapter() != nullptr &&
host_name.Type() == HostNameType::Ipv4) {
std::string ipv4_s = winrt::to_string(host_name.ToString());
if (absl::EndsWith(ipv4_s, ".1")) {
// TODO(b/228541380): replace when we find a better way to
// identifying the hotspot address
NEARBY_LOGS(INFO) << "Found Hotspot IP: " << ipv4_s;
return ipv4_s;
ip_candidates.push_back(ipv4_s);
}
}
}
if (ip_candidates.empty()) {
continue;
}
// Windows always creates Hotspot at address "192.168.137.1".
for (auto &ip_candidate : ip_candidates) {
if (ip_candidate == "192.168.137.1") {
NEARBY_LOGS(INFO) << "Found Hotspot IP: " << ip_candidate;
return ip_candidate;
}
}
NEARBY_LOGS(INFO) << "Found Hotspot IP: " << ip_candidates.front();
return ip_candidates.front();
}
return {};
} catch (std::exception exception) {