TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Applied flags to Wi-Fi Hotspot parameters

Browse Source 
PiperOrigin-RevId: 540432082
This commit is contained in:
Guogang Li
2023-06-14 18:00:52 -07:00
committed by Copybara-Service
parent a25ef756e7
commit 0c1d5e7e23
3 changed files with 89 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/flags/nearby_platform_feature_flags.h
+24
View File
@@ -43,6 +43,30 @@ constexpr auto kEnableBleV2Gatt =
constexpr auto kEnableBleV2GattOnNonExtendedDevice =
flags::Flag<bool>(kConfigPackage, "45415267", false);
// The maximum scanning times for available hotspots.
constexpr auto kWifiHotspotScanMaxRetries =
flags::Flag<int64_t>(kConfigPackage, "45415883", 3);
// The maximum IP check times during Wi-Fi hotspot connection.
constexpr auto kWifiHotspotCheckIpMaxRetries =
flags::Flag<int64_t>(kConfigPackage, "45415884", 10);
// The interval between 2 IP check attempts.
constexpr auto kWifiHotspotCheckIpIntervalMillis =
flags::Flag<int64_t>(kConfigPackage, "45415885", 500);
// The maximum connection times to remote Wi-Fi hotspot.
constexpr auto kWifiHotspotConnectionMaxRetries =
flags::Flag<int64_t>(kConfigPackage, "45415886", 3);
// The interval between 2 connectin attempts.
constexpr auto kWifiHotspotConnectionIntervalMillis =
flags::Flag<int64_t>(kConfigPackage, "45415887", 500);
// The connection timeout to remote Wi-Fi hotspot.
constexpr auto kWifiHotspotConnectionTimeoutMillis =
flags::Flag<int64_t>(kConfigPackage, "45415888", 10000);
} // namespace nearby_platform_feature
} // namespace config_package_nearby
} // namespace platform
internal/platform/implementation/windows/wifi_hotspot_medium.cc
+46 -31
View File
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include <cstdint>
#include <exception>
#include <memory>
#include <string>
@@ -21,39 +22,17 @@
#include "absl/strings/string_view.h"
#include "absl/time/time.h"
#include "internal/platform/feature_flags.h"
#include "internal/platform/flags/nearby_platform_feature_flags.h"
#include "internal/platform/implementation/windows/wifi_hotspot.h"
// Nearby connections headers
#include "internal/flags/nearby_flags.h"
#include "internal/platform/cancellation_flag_listener.h"
#include "internal/platform/implementation/windows/utils.h"
#include "internal/platform/logging.h"
namespace nearby {
namespace windows {
namespace {
// The maximum scanning times for available hot sports.
constexpr int kWifiHotspotMaxScans = 3;
// The maximum connection times to remote Wi-Fi hotspot.
constexpr int kWifiHotspotMaxConnectionRetries = 3;
// The interval between 2 connectin attempts.
constexpr absl::Duration kWifiHotspotRetryIntervalMillis =
absl::Milliseconds(300);
// The connection timeout to remote Wi-Fi hotspot.
constexpr absl::Duration kWifiHotspotClientSocketConnectTimeoutMillis =
absl::Milliseconds(10000);
// The maximum times to check IP address.
constexpr int kIpAddressMaxRetries = 20;
// The time interval to check IP address.
constexpr absl::Duration kIpAddressRetryIntervalMillis =
absl::Milliseconds(200);
} // namespace
WifiHotspotMedium::WifiHotspotMedium() {}
@@ -104,9 +83,29 @@ std::unique_ptr<api::WifiHotspotSocket> WifiHotspotMedium::ConnectToService(
HostName host_name{winrt::to_hstring(ipv4_address)};
winrt::hstring service_name{winrt::to_hstring(port)};
// Try connecting to the service up to kWifiHotspotMaxConnectionRetries,
// Try connecting to the service up to wifi_hotspot_max_connection_retries,
// because it may fail first time if DHCP procedure is not finished yet.
for (int i = 0; i < kWifiHotspotMaxConnectionRetries; i++) {
int64_t wifi_hotspot_max_connection_retries =
NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotConnectionMaxRetries);
int64_t wifi_hotspot_retry_interval_millis =
NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotConnectionIntervalMillis);
int64_t wifi_hotspot_client_socket_connect_timeout_millis =
NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotConnectionTimeoutMillis);
NEARBY_LOGS(INFO) << "maximum connection retries="
<< wifi_hotspot_max_connection_retries
<< ", connection interval="
<< wifi_hotspot_retry_interval_millis
<< "ms, connection timeout="
<< wifi_hotspot_client_socket_connect_timeout_millis
<< "ms";
for (int i = 0; i < wifi_hotspot_max_connection_retries; i++) {
try {
StreamSocket socket{};
// Listener to connect cancellation.
@@ -136,7 +135,8 @@ std::unique_ptr<api::WifiHotspotSocket> WifiHotspotMedium::ConnectToService(
NEARBY_LOGS(WARNING) << "connect is closed due to timeout.";
socket.Close();
},
kWifiHotspotClientSocketConnectTimeoutMillis);
absl::Milliseconds(
wifi_hotspot_client_socket_connect_timeout_millis));
}
socket.ConnectAsync(host_name, service_name).get();
@@ -171,7 +171,7 @@ std::unique_ptr<api::WifiHotspotSocket> WifiHotspotMedium::ConnectToService(
connection_timeout_ = nullptr;
}
Sleep(kWifiHotspotRetryIntervalMillis / absl::Milliseconds(1));
Sleep(wifi_hotspot_retry_interval_millis);
}
return nullptr;
}
@@ -430,7 +430,12 @@ bool WifiHotspotMedium::ConnectWifiHotspot(
wifi_adapter_.ScanAsync().get();
wifi_connected_network_ = nullptr;
for (int i = 0; i < kWifiHotspotMaxScans; i++) {
int64_t wifi_hotspot_max_scans = NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotScanMaxRetries);
NEARBY_LOGS(INFO) << "maximum scan retries=" << wifi_hotspot_max_scans;
for (int i = 0; i < wifi_hotspot_max_scans; i++) {
for (const auto& network :
wifi_adapter_.NetworkReport().AvailableNetworks()) {
if (!wifi_connected_network_ && !ssid.empty() &&
@@ -473,11 +478,21 @@ bool WifiHotspotMedium::ConnectWifiHotspot(
// Make sure IP address is ready.
std::string ip_address;
for (int i = 0; i < kIpAddressMaxRetries; i++) {
int64_t ip_address_max_retries = NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotCheckIpMaxRetries);
int64_t ip_address_retry_interval_millis =
NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotCheckIpIntervalMillis);
NEARBY_LOGS(INFO) << "maximum IP check retries=" << ip_address_max_retries
<< ", IP check interval="
<< ip_address_retry_interval_millis << "ms";
for (int i = 0; i < ip_address_max_retries; i++) {
NEARBY_LOGS(INFO) << "Check IP address at attemp " << i;
std::vector<std::string> ip_addresses = GetIpv4Addresses();
if (ip_addresses.empty()) {
Sleep(kIpAddressRetryIntervalMillis / absl::Milliseconds(1));
Sleep(ip_address_retry_interval_millis);
continue;
}
ip_address = ip_addresses[0];
internal/platform/implementation/windows/wifi_hotspot_server_socket.cc
+19 -7
View File
@@ -34,9 +34,6 @@ namespace nearby {
namespace windows {
namespace {
using ::winrt::Windows::Networking::Sockets::SocketQualityOfService;
constexpr int kMaxRetries = 3;
constexpr int kRetryIntervalMilliSeconds = 300;
} // namespace
WifiHotspotServerSocket::WifiHotspotServerSocket(int port) : port_(port) {}
@@ -391,13 +388,24 @@ bool WifiHotspotServerSocket::SetupServerSocketWinSock() {
bool WifiHotspotServerSocket::listen() {
// Get current IP addresses of the device.
for (int i = 0; i < kMaxRetries; i++) {
int64_t ip_address_max_retries = NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotCheckIpMaxRetries);
int64_t ip_address_retry_interval_millis =
NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotCheckIpIntervalMillis);
NEARBY_LOGS(INFO) << "maximum IP check retries=" << ip_address_max_retries
<< ", IP check interval="
<< ip_address_retry_interval_millis << "ms";
for (int i = 0; i < ip_address_max_retries; i++) {
hotspot_ipaddr_ = GetHotspotIpAddresses();
if (hotspot_ipaddr_.empty()) {
NEARBY_LOGS(WARNING) << "Failed to find Hotspot's IP addr for the try: "
<< i + 1 << ". Wait " << kRetryIntervalMilliSeconds
<< i + 1 << ". Wait "
<< ip_address_retry_interval_millis
<< "ms snd try again";
Sleep(kRetryIntervalMilliSeconds);
Sleep(ip_address_retry_interval_millis);
} else {
break;
}
@@ -447,7 +455,11 @@ std::vector<std::string> WifiHotspotServerSocket::GetIpAddresses() const {
std::string WifiHotspotServerSocket::GetHotspotIpAddresses() const {
try {
for (int i = 0; i < kMaxRetries; i++) {
int64_t ip_address_max_retries = NearbyFlags::GetInstance().GetInt64Flag(
platform::config_package_nearby::nearby_platform_feature::
kWifiHotspotCheckIpMaxRetries);
for (int i = 0; i < ip_address_max_retries; i++) {
auto host_names = NetworkInformation::GetHostNames();
for (auto host_name : host_names) {
if (host_name.IPInformation() != nullptr &&