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

Add Wifi Hotspot AP and Client validation check

Browse Source 
PiperOrigin-RevId: 451492039
This commit is contained in:
hai007
2022-05-27 15:20:36 -07:00
committed by Copybara-Service
parent 10605d5534
commit 37b0c31319
13 changed files with 84 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/bwu_manager.cc
+1 -1
View File
@@ -1180,7 +1180,7 @@ std::vector<Medium> BwuManager::StripOutUnavailableMediums(
bool available = false;
switch (m) {
case Medium::WIFI_HOTSPOT:
available = mediums_->GetWifiHotspot().IsAvailable();
available = mediums_->GetWifiHotspot().IsAPAvailable();
break;
case Medium::WIFI_LAN:
available = mediums_->GetWifiLan().IsAvailable();
connections/implementation/mediums/wifi_hotspot.cc
+16 -5
View File
@@ -39,13 +39,24 @@ WifiHotspot::~WifiHotspot() {
accept_loops_runner_.Shutdown();
}
bool WifiHotspot::IsAvailable() const {
bool WifiHotspot::IsAPAvailable() const {
MutexLock lock(&mutex_);
return IsAvailableLocked();
return IsAPAvailableLocked();
}
bool WifiHotspot::IsAvailableLocked() const { return medium_.IsValid(); }
bool WifiHotspot::IsAPAvailableLocked() const {
if (medium_.IsValid()) return medium_.IsInterfaceValid();
return false;
}
bool WifiHotspot::IsClientAvailable() const {
MutexLock lock(&mutex_);
return IsClientAvailableLocked();
}
bool WifiHotspot::IsClientAvailableLocked() const { return medium_.IsValid(); }
bool WifiHotspot::IsHotspotStarted() {
MutexLock lock(&mutex_);
@@ -135,7 +146,7 @@ bool WifiHotspot::StartAcceptingConnections(
return false;
}
if (!IsAvailableLocked()) {
if (!IsAPAvailableLocked()) {
NEARBY_LOGS(INFO)
<< "Can't start accepting WifiHotspot connections [service_id="
<< service_id << "]; WifiHotspot not available.";
@@ -250,7 +261,7 @@ WifiHotspotSocket WifiHotspot::Connect(const std::string& service_id,
return socket;
}
if (!IsAvailableLocked()) {
if (!IsClientAvailableLocked()) {
NEARBY_LOGS(INFO) << "Can't create client WifiHotspot socket [service_id="
<< service_id << "]; WifiHotspot isn't available.";
return socket;
connections/implementation/mediums/wifi_hotspot.h
+4 -2
View File
@@ -45,7 +45,8 @@ class WifiHotspot {
// Returns true, if WifiHotspot communications are supported by a platform.
bool IsAvailable() const ABSL_LOCKS_EXCLUDED(mutex_);
bool IsAPAvailable() const ABSL_LOCKS_EXCLUDED(mutex_);
bool IsClientAvailable() const ABSL_LOCKS_EXCLUDED(mutex_);
bool IsHotspotStarted() ABSL_LOCKS_EXCLUDED(mutex_);
bool StartWifiHotspot() ABSL_LOCKS_EXCLUDED(mutex_);
@@ -89,7 +90,8 @@ class WifiHotspot {
static constexpr int kMaxConcurrentAcceptLoops = 5;
// Same as IsAvailable(), but must be called with mutex_ held.
bool IsAvailableLocked() const ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
bool IsAPAvailableLocked() const ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
bool IsClientAvailableLocked() const ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
// Same as IsAcceptingConnections(), but must be called with mutex_ held.
bool IsAcceptingConnectionsLocked(const std::string& service_id)
connections/implementation/mediums/wifi_hotspot_test.cc
+9 -5
View File
@@ -65,17 +65,21 @@ TEST_F(WifiHotspotTest, ConstructorDestructorWorks) {
auto wifi_hotspot_a = std::make_unique<WifiHotspot>();
auto wifi_hotspot_b = std::make_unique<WifiHotspot>();
EXPECT_TRUE(wifi_hotspot_a->IsAvailable());
EXPECT_TRUE(wifi_hotspot_b->IsAvailable());
EXPECT_TRUE(wifi_hotspot_a->IsClientAvailable());
EXPECT_TRUE(wifi_hotspot_b->IsClientAvailable());
}
TEST_F(WifiHotspotTest, CanStartStopHotspot) {
std::string service_id(kServiceID);
auto wifi_hotspot_a = std::make_unique<WifiHotspot>();
EXPECT_TRUE(wifi_hotspot_a->StartWifiHotspot());
EXPECT_TRUE(wifi_hotspot_a->StartAcceptingConnections(service_id, {}));
EXPECT_TRUE(wifi_hotspot_a->StopWifiHotspot());
if (wifi_hotspot_a->IsAPAvailable()) {
EXPECT_TRUE(wifi_hotspot_a->StartWifiHotspot());
EXPECT_TRUE(wifi_hotspot_a->StartAcceptingConnections(service_id, {}));
EXPECT_TRUE(wifi_hotspot_a->StopWifiHotspot());
} else {
EXPECT_FALSE(wifi_hotspot_a->StartWifiHotspot());
}
}
TEST_F(WifiHotspotTest, CanConnectDisconnectHotspot) {
connections/implementation/p2p_point_to_point_pcp_handler.cc
+2 -1
View File
@@ -28,7 +28,8 @@ P2pPointToPointPcpHandler::P2pPointToPointPcpHandler(
std::vector<proto::connections::Medium>
P2pPointToPointPcpHandler::GetConnectionMediumsByPriority() {
std::vector<proto::connections::Medium> mediums;
if (mediums_->GetWifiHotspot().IsAvailable()) {
if (mediums_->GetWifi().IsAvailable() &&
mediums_->GetWifiHotspot().IsClientAvailable()) {
mediums.push_back(proto::connections::WIFI_HOTSPOT);
}
if (mediums_->GetWifiLan().IsAvailable()) {
connections/implementation/p2p_star_pcp_handler.cc
+2 -1
View File
@@ -33,7 +33,8 @@ P2pStarPcpHandler::P2pStarPcpHandler(
std::vector<proto::connections::Medium>
P2pStarPcpHandler::GetConnectionMediumsByPriority() {
std::vector<proto::connections::Medium> mediums;
if (mediums_->GetWifiHotspot().IsAvailable()) {
if (mediums_->GetWifi().IsAvailable() &&
mediums_->GetWifiHotspot().IsClientAvailable()) {
mediums.push_back(proto::connections::WIFI_HOTSPOT);
}
if (mediums_->GetWifiLan().IsAvailable()) {
internal/platform/implementation/g3/wifi_hotspot.cc
+6
View File
@@ -187,6 +187,9 @@ bool WifiHotspotMedium::StartWifiHotspot(
HotspotCredentials* hotspot_credentials) {
absl::MutexLock lock(&mutex_);
if (!IsInterfaceValid())
return false;
std::string ssid = absl::StrCat("DIRECT-", Prng().NextUint32());
hotspot_credentials->SetSSID(ssid);
std::string password = absl::StrFormat("%08x", Prng().NextUint32());
@@ -206,6 +209,9 @@ bool WifiHotspotMedium::StopWifiHotspot() {
absl::MutexLock lock(&mutex_);
NEARBY_LOGS(INFO) << "G3 StopWifiHotspot";
if (!IsInterfaceValid())
return false;
auto& env = MediumEnvironment::Instance();
env.UpdateWifiHotspotMediumForStartOrConnect(*this, /*credentials*/nullptr,
/*is_ap=*/true,
internal/platform/implementation/g3/wifi_hotspot.h
+3
View File
@@ -184,6 +184,9 @@ class WifiHotspotMedium : public api::WifiHotspotMedium {
WifiHotspotMedium& operator=(const WifiHotspotMedium&) = delete;
WifiHotspotMedium& operator=(WifiHotspotMedium&&) = delete;
// If the WIFI Adaptor supports to start a Hotspot interface.
bool IsInterfaceValid() const override { return true;}
// Discoverer connects to server socket
std::unique_ptr<api::WifiHotspotSocket> ConnectToService(
absl::string_view ip_address, int port,
internal/platform/implementation/wifi_hotspot.h
+3
View File
@@ -74,6 +74,9 @@ class WifiHotspotMedium {
public:
virtual ~WifiHotspotMedium() = default;
// If the WIFI Adaptor supports to start a Hotspot interface.
virtual bool IsInterfaceValid() const = 0;
// Connects to a WifiHotspot service by ip address and port.
// On success, returns a new WifiHotspotSocket.
// On error, returns nullptr.
internal/platform/implementation/windows/wifi_hotspot.h
+11
View File
@@ -15,6 +15,10 @@
#ifndef PLATFORM_IMPL_WINDOWS_WIFI_HOTSPOT_H_
#define PLATFORM_IMPL_WINDOWS_WIFI_HOTSPOT_H_
// Standard C/C++ headers
#include <functional>
#include <string>
// Nearby connections headers
#include "internal/platform/implementation/wifi_hotspot.h"
@@ -209,8 +213,12 @@ class WifiHotspotServerSocket : public api::WifiHotspotServerSocket {
// Container of operations that can be performed over the WifiHotspot medium.
class WifiHotspotMedium : public api::WifiHotspotMedium {
public:
WifiHotspotMedium();
~WifiHotspotMedium() override;
// If the WIFI Adaptor supports to start a Hotspot interface.
bool IsInterfaceValid() const override;
// Discoverer connects to server socket
std::unique_ptr<api::WifiHotspotSocket> ConnectToService(
absl::string_view ip_address, int port,
@@ -271,6 +279,9 @@ class WifiHotspotMedium : public api::WifiHotspotMedium {
// Protects to access some members
absl::Mutex mutex_;
// If the WiFi Adaptor supports to start a Hotspot interface.
bool hotspot_interface_valid_;
// Medium Status
int medium_status_ = kMediumStatusIdle;
internal/platform/implementation/windows/wifi_hotspot_medium.cc
+12
View File
@@ -29,11 +29,23 @@ namespace {
constexpr int kMaxScans = 3;
} // namespace
WifiHotspotMedium::WifiHotspotMedium() {
HotspotCredentials hotspot_credentials_;
hotspot_interface_valid_ = StartWifiHotspot(&hotspot_credentials_);
if (hotspot_interface_valid_)
StopWifiHotspot();
}
WifiHotspotMedium::~WifiHotspotMedium() {
StopWifiHotspot();
DisconnectWifiHotspot();
}
bool WifiHotspotMedium::IsInterfaceValid() const {
return hotspot_interface_valid_;
}
std::unique_ptr<api::WifiHotspotSocket> WifiHotspotMedium::ConnectToService(
absl::string_view ip_address, int port,
CancellationFlag* cancellation_flag) {
internal/platform/wifi_hotspot.h
+5
View File
@@ -194,6 +194,11 @@ class WifiHotspotMedium {
return &hotspot_credentials_;
}
bool IsInterfaceValid() const {
CHECK(impl_);
return impl_->IsInterfaceValid();
}
bool IsValid() const { return impl_ != nullptr; }
// since impl_ could be nullptr if platform hasn't implemented this Medium,
internal/platform/wifi_hotspot_test.cc
+10 -2
View File
@@ -85,8 +85,8 @@ TEST_F(WifiHotspotMediumTest, ConstructorDestructorWorks) {
auto wifi_hotspot_b = std::make_unique<WifiHotspotMedium>();
// Make sure we can create functional mediums.
ASSERT_TRUE(wifi_hotspot_a->IsValid());
ASSERT_TRUE(wifi_hotspot_b->IsValid());
ASSERT_TRUE(wifi_hotspot_a->IsInterfaceValid());
ASSERT_TRUE(wifi_hotspot_b->IsInterfaceValid());
// Make sure we can create 2 distinct mediums.
EXPECT_NE(&wifi_hotspot_a->GetImpl(), &wifi_hotspot_b->GetImpl());
@@ -97,6 +97,7 @@ TEST_F(WifiHotspotMediumTest, ConstructorDestructorWorks) {
TEST_F(WifiHotspotMediumTest, CanStartStopHotspot) {
auto wifi_hotspot_a = std::make_unique<WifiHotspotMedium>();
ASSERT_TRUE(wifi_hotspot_a->IsInterfaceValid());
EXPECT_TRUE(wifi_hotspot_a->StartWifiHotspot());
EXPECT_EQ(wifi_hotspot_a->GetDynamicPortRange(), std::nullopt);
WifiHotspotServerSocket server_socket = wifi_hotspot_a->ListenForService();
@@ -111,6 +112,7 @@ TEST_F(WifiHotspotMediumTest, CanConnectDisconnectHotspot) {
std::string ssid(kSsid);
std::string password(kPassword);
ASSERT_TRUE(wifi_hotspot_a->IsInterfaceValid());
EXPECT_FALSE(wifi_hotspot_a->ConnectWifiHotspot(ssid, password));
EXPECT_TRUE(wifi_hotspot_a->DisconnectWifiHotspot());
wifi_hotspot_a.reset();
@@ -122,6 +124,8 @@ TEST_P(WifiHotspotMediumTest, CanStartHotspotThatOtherConnect) {
auto wifi_hotspot_a = std::make_unique<WifiHotspotMedium>();
auto wifi_hotspot_b = std::make_unique<WifiHotspotMedium>();
ASSERT_TRUE(wifi_hotspot_a->IsInterfaceValid());
ASSERT_TRUE(wifi_hotspot_b->IsInterfaceValid());
EXPECT_TRUE(wifi_hotspot_a->StartWifiHotspot());
HotspotCredentials* hotspot_credentials = wifi_hotspot_a->GetCredential();
EXPECT_TRUE(wifi_hotspot_b->ConnectWifiHotspot(
@@ -186,6 +190,8 @@ TEST_P(WifiHotspotMediumTest, CanStartHotspotThatOtherCanCancelConnect) {
auto wifi_hotspot_a = std::make_unique<WifiHotspotMedium>();
auto wifi_hotspot_b = std::make_unique<WifiHotspotMedium>();
ASSERT_TRUE(wifi_hotspot_a->IsInterfaceValid());
ASSERT_TRUE(wifi_hotspot_b->IsInterfaceValid());
EXPECT_TRUE(wifi_hotspot_a->StartWifiHotspot());
HotspotCredentials* hotspot_credentials = wifi_hotspot_a->GetCredential();
EXPECT_TRUE(wifi_hotspot_b->ConnectWifiHotspot(
@@ -242,6 +248,8 @@ TEST_F(WifiHotspotMediumTest, CanStartHotspotTheOtherFailConnect) {
auto wifi_hotspot_a = std::make_unique<WifiHotspotMedium>();
auto wifi_hotspot_b = std::make_unique<WifiHotspotMedium>();
ASSERT_TRUE(wifi_hotspot_a->IsInterfaceValid());
ASSERT_TRUE(wifi_hotspot_b->IsInterfaceValid());
EXPECT_TRUE(wifi_hotspot_a->StartWifiHotspot());
std::string ssid(kSsid);