summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/test/rootcanal/bluetooth_hci.cc18
-rw-r--r--system/test/rootcanal/bluetooth_hci.h11
-rw-r--r--tools/rootcanal/desktop/test_environment.cc28
-rw-r--r--tools/rootcanal/desktop/test_environment.h13
-rw-r--r--tools/rootcanal/model/setup/test_model.cc57
-rw-r--r--tools/rootcanal/model/setup/test_model.h25
6 files changed, 71 insertions, 81 deletions
diff --git a/system/test/rootcanal/bluetooth_hci.cc b/system/test/rootcanal/bluetooth_hci.cc
index b5870fa71e..7ceff6720c 100644
--- a/system/test/rootcanal/bluetooth_hci.cc
+++ b/system/test/rootcanal/bluetooth_hci.cc
@@ -25,6 +25,8 @@
#include "hci_internals.h"
#include "log/log.h"
+#include "model/devices/hci_socket_device.h"
+#include "model/devices/link_layer_socket_device.h"
namespace android {
namespace hardware {
@@ -35,6 +37,8 @@ namespace sim {
using android::hardware::hidl_vec;
using rootcanal::AsyncTaskId;
using rootcanal::DualModeController;
+using rootcanal::HciSocketDevice;
+using rootcanal::LinkLayerSocketDevice;
using rootcanal::TaskCallback;
namespace {
@@ -201,12 +205,14 @@ Return<void> BluetoothHci::initialize_impl(
SetUpTestChannel();
SetUpHciServer([this](std::shared_ptr<AsyncDataChannel> socket,
AsyncDataChannelServer* srv) {
- test_model_.IncomingHciConnection(socket);
+ test_model_.AddHciConnection(HciSocketDevice::Create(socket, ""));
srv->StartListening();
});
SetUpLinkLayerServer([this](std::shared_ptr<AsyncDataChannel> socket,
AsyncDataChannelServer* srv) {
- test_model_.IncomingLinkLayerConnection(socket);
+ auto phy_type = Phy::Type::BR_EDR;
+ test_model_.AddLinkLayerConnection(
+ LinkLayerSocketDevice::Create(socket, phy_type), phy_type);
srv->StartListening();
});
} else {
@@ -313,9 +319,11 @@ void BluetoothHci::SetUpLinkLayerServer(ConnectCallback connection_callback) {
});
}
-std::shared_ptr<AsyncDataChannel> BluetoothHci::ConnectToRemoteServer(
- const std::string& server, int port) {
- return connector_->ConnectToRemoteServer(server, port);
+std::shared_ptr<Device> BluetoothHci::ConnectToRemoteServer(
+ const std::string& server, int port, Phy::Type phy_type) {
+ auto socket = connector_->ConnectToRemoteServer(server, port);
+ if (!socket->Connected()) return nullptr;
+ return LinkLayerSocketDevice::Create(socket, phy_type);
}
void BluetoothHci::SetUpTestChannel() {
diff --git a/system/test/rootcanal/bluetooth_hci.h b/system/test/rootcanal/bluetooth_hci.h
index 44b47ddd61..1bceda8812 100644
--- a/system/test/rootcanal/bluetooth_hci.h
+++ b/system/test/rootcanal/bluetooth_hci.h
@@ -42,6 +42,9 @@ using android::net::AsyncDataChannelConnector;
using android::net::AsyncDataChannelServer;
using android::net::ConnectCallback;
+using rootcanal::Device;
+using rootcanal::Phy;
+
class BluetoothHci : public IBluetoothHci {
public:
BluetoothHci();
@@ -89,8 +92,8 @@ class BluetoothHci : public IBluetoothHci {
void SetUpTestChannel();
void SetUpHciServer(ConnectCallback on_connect);
void SetUpLinkLayerServer(ConnectCallback on_connect);
- std::shared_ptr<AsyncDataChannel> ConnectToRemoteServer(
- const std::string& server, int port);
+ std::shared_ptr<Device> ConnectToRemoteServer(const std::string& server,
+ int port, Phy::Type phy_type);
std::shared_ptr<rootcanal::DualModeController> controller_;
@@ -121,8 +124,8 @@ class BluetoothHci : public IBluetoothHci {
async_manager_.CancelAsyncTask(task);
},
- [this](const std::string& server, int port) {
- return ConnectToRemoteServer(server, port);
+ [this](const std::string& server, int port, Phy::Type phy_type) {
+ return ConnectToRemoteServer(server, port, phy_type);
}};
rootcanal::TestCommandHandler test_channel_{test_model_};
};
diff --git a/tools/rootcanal/desktop/test_environment.cc b/tools/rootcanal/desktop/test_environment.cc
index 8aa01081c5..530abab5a5 100644
--- a/tools/rootcanal/desktop/test_environment.cc
+++ b/tools/rootcanal/desktop/test_environment.cc
@@ -20,14 +20,19 @@
#include <utility> // for move
#include <vector> // for vector
-#include "net/async_data_channel.h" // for AsyncDataChannel
-#include "os/log.h" // for LOG_INFO, LOG_ERROR, LOG_WARN
+#include "model/devices/hci_socket_device.h" // for HciSocketDevice
+#include "model/devices/link_layer_socket_device.h" // for LinkLayerSocketDevice
+#include "net/async_data_channel.h" // for AsyncDataChannel
+#include "net/async_data_channel_connector.h" // for AsyncDataChannelConnector
+#include "os/log.h" // for LOG_INFO, LOG_ERROR, LOG_WARN
namespace android {
namespace bluetooth {
namespace root_canal {
using rootcanal::AsyncTaskId;
+using rootcanal::HciSocketDevice;
+using rootcanal::LinkLayerSocketDevice;
using rootcanal::TaskCallback;
void TestEnvironment::initialize(std::promise<void> barrier) {
@@ -52,7 +57,8 @@ void TestEnvironment::initialize(std::promise<void> barrier) {
SetUpTestChannel();
SetUpHciServer([this](std::shared_ptr<AsyncDataChannel> socket,
AsyncDataChannelServer* srv) {
- test_model_.IncomingHciConnection(socket, controller_properties_file_);
+ test_model_.AddHciConnection(
+ HciSocketDevice::Create(socket, controller_properties_file_));
srv->StartListening();
});
SetUpLinkLayerServer();
@@ -81,7 +87,9 @@ void TestEnvironment::SetUpLinkBleLayerServer() {
remote_link_layer_transport_.SetUp(
link_ble_socket_server_, [this](std::shared_ptr<AsyncDataChannel> socket,
AsyncDataChannelServer* srv) {
- test_model_.IncomingLinkBleLayerConnection(socket);
+ auto phy_type = Phy::Type::LOW_ENERGY;
+ test_model_.AddLinkLayerConnection(
+ LinkLayerSocketDevice::Create(socket, phy_type), phy_type);
srv->StartListening();
});
@@ -94,7 +102,9 @@ void TestEnvironment::SetUpLinkLayerServer() {
remote_link_layer_transport_.SetUp(
link_socket_server_, [this](std::shared_ptr<AsyncDataChannel> socket,
AsyncDataChannelServer* srv) {
- test_model_.IncomingLinkLayerConnection(socket);
+ auto phy_type = Phy::Type::BR_EDR;
+ test_model_.AddLinkLayerConnection(
+ LinkLayerSocketDevice::Create(socket, phy_type), phy_type);
srv->StartListening();
});
@@ -103,9 +113,11 @@ void TestEnvironment::SetUpLinkLayerServer() {
});
}
-std::shared_ptr<AsyncDataChannel> TestEnvironment::ConnectToRemoteServer(
- const std::string& server, int port) {
- return connector_->ConnectToRemoteServer(server, port);
+std::shared_ptr<Device> TestEnvironment::ConnectToRemoteServer(
+ const std::string& server, int port, Phy::Type phy_type) {
+ auto socket = connector_->ConnectToRemoteServer(server, port);
+ if (!socket->Connected()) return nullptr;
+ return LinkLayerSocketDevice::Create(socket, phy_type);
}
void TestEnvironment::SetUpTestChannel() {
diff --git a/tools/rootcanal/desktop/test_environment.h b/tools/rootcanal/desktop/test_environment.h
index e2bc6482aa..fd651e7ebb 100644
--- a/tools/rootcanal/desktop/test_environment.h
+++ b/tools/rootcanal/desktop/test_environment.h
@@ -43,6 +43,9 @@ using android::net::AsyncDataChannelConnector;
using android::net::AsyncDataChannelServer;
using android::net::ConnectCallback;
+using rootcanal::Device;
+using rootcanal::Phy;
+
class TestEnvironment {
public:
TestEnvironment(std::shared_ptr<AsyncDataChannelServer> test_port,
@@ -82,8 +85,8 @@ class TestEnvironment {
void SetUpHciServer(ConnectCallback on_connect);
void SetUpLinkLayerServer();
void SetUpLinkBleLayerServer();
- std::shared_ptr<AsyncDataChannel> ConnectToRemoteServer(
- const std::string& server, int port);
+ std::shared_ptr<Device> ConnectToRemoteServer(const std::string& server,
+ int port, Phy::Type phy_type);
std::shared_ptr<rootcanal::DualModeController> controller_;
@@ -114,12 +117,12 @@ class TestEnvironment {
async_manager_.CancelAsyncTask(task);
},
- [this](const std::string& server, int port) {
- return ConnectToRemoteServer(server, port);
+ [this](const std::string& server, int port, Phy::Type phy_type) {
+ return ConnectToRemoteServer(server, port, phy_type);
}};
rootcanal::TestCommandHandler test_channel_{test_model_};
};
} // namespace root_canal
} // namespace bluetooth
-} // namespace android \ No newline at end of file
+} // namespace android
diff --git a/tools/rootcanal/model/setup/test_model.cc b/tools/rootcanal/model/setup/test_model.cc
index 643a2b19d3..3b993b4360 100644
--- a/tools/rootcanal/model/setup/test_model.cc
+++ b/tools/rootcanal/model/setup/test_model.cc
@@ -24,10 +24,8 @@
#include <type_traits> // for remove_extent_t
#include <utility> // for move
-#include "include/phy.h" // for Phy, Phy::Type
-#include "model/devices/hci_socket_device.h" // for HciSocketDevice
-#include "model/devices/link_layer_socket_device.h" // for LinkLayerSocketDevice
-#include "os/log.h" // for LOG_WARN, LOG_INFO
+#include "include/phy.h" // for Phy, Phy::Type
+#include "os/log.h" // for LOG_WARN, LOG_INFO
namespace rootcanal {
@@ -43,7 +41,7 @@ TestModel::TestModel(
std::function<void(AsyncUserId)> cancel_tasks_from_user,
std::function<void(AsyncTaskId)> cancel,
- std::function<std::shared_ptr<AsyncDataChannel>(const std::string&, int)>
+ std::function<std::shared_ptr<Device>(const std::string&, int, Phy::Type)>
connect_to_remote)
: get_user_id_(std::move(get_user_id)),
schedule_task_(std::move(event_scheduler)),
@@ -144,12 +142,10 @@ void TestModel::DelDeviceFromPhy(size_t dev_index, size_t phy_index) {
});
}
-void TestModel::AddLinkLayerConnection(std::shared_ptr<AsyncDataChannel> socket,
+void TestModel::AddLinkLayerConnection(std::shared_ptr<Device> dev,
Phy::Type phy_type) {
LOG_INFO("Adding a new link layer connection of type: %s",
phy_type == Phy::Type::BR_EDR ? "BR_EDR" : "LOW_ENERGY");
- std::shared_ptr<Device> dev = LinkLayerSocketDevice::Create(socket, phy_type);
-
int index = Add(dev);
AsyncUserId user_id = get_user_id_();
@@ -159,39 +155,23 @@ void TestModel::AddLinkLayerConnection(std::shared_ptr<AsyncDataChannel> socket,
}
}
- dev->RegisterCloseCallback([this, socket, index, user_id] {
- schedule_task_(user_id, std::chrono::milliseconds(0),
- [this, socket, index, user_id]() {
- OnConnectionClosed(socket, index, user_id);
- });
+ dev->RegisterCloseCallback([this, index, user_id] {
+ schedule_task_(
+ user_id, std::chrono::milliseconds(0),
+ [this, index, user_id]() { OnConnectionClosed(index, user_id); });
});
}
-void TestModel::IncomingLinkLayerConnection(
- std::shared_ptr<AsyncDataChannel> socket) {
- LOG_INFO("A new link layer connection has arrived.");
- AddLinkLayerConnection(socket, Phy::Type::BR_EDR);
-}
-
-void TestModel::IncomingLinkBleLayerConnection(
- std::shared_ptr<AsyncDataChannel> socket) {
- LOG_INFO("A new low energery link layer (BLE) connection has arrived.");
- AddLinkLayerConnection(socket, Phy::Type::LOW_ENERGY);
-}
-
void TestModel::AddRemote(const std::string& server, int port,
Phy::Type phy_type) {
- LOG_INFO("Connecting to %s:%d", server.c_str(), port);
- std::shared_ptr<AsyncDataChannel> socket = connect_to_remote_(server, port);
- if (!socket->Connected()) {
+ auto dev = connect_to_remote_(server, port, phy_type);
+ if (dev == nullptr) {
return;
}
- AddLinkLayerConnection(socket, phy_type);
+ AddLinkLayerConnection(dev, phy_type);
}
-void TestModel::IncomingHciConnection(std::shared_ptr<AsyncDataChannel> socket,
- std::string properties_filename) {
- auto dev = HciSocketDevice::Create(socket, properties_filename);
+void TestModel::AddHciConnection(std::shared_ptr<HciSocketDevice> dev) {
size_t index = Add(std::static_pointer_cast<Device>(dev));
std::string addr = "da:4c:10:de:17:"; // Da HCI dev
std::stringstream stream;
@@ -209,21 +189,18 @@ void TestModel::IncomingHciConnection(std::shared_ptr<AsyncDataChannel> socket,
return schedule_task_(user_id, delay, std::move(task_callback));
});
dev->RegisterTaskCancel(cancel_task_);
- dev->RegisterCloseCallback([this, socket, index, user_id] {
- schedule_task_(user_id, std::chrono::milliseconds(0),
- [this, socket, index, user_id]() {
- OnConnectionClosed(socket, index, user_id);
- });
+ dev->RegisterCloseCallback([this, index, user_id] {
+ schedule_task_(
+ user_id, std::chrono::milliseconds(0),
+ [this, index, user_id]() { OnConnectionClosed(index, user_id); });
});
}
-void TestModel::OnConnectionClosed(std::shared_ptr<AsyncDataChannel> socket,
- size_t index, AsyncUserId user_id) {
+void TestModel::OnConnectionClosed(size_t index, AsyncUserId user_id) {
if (index >= devices_.size() || devices_[index] == nullptr) {
LOG_WARN("Unknown device %zu", index);
return;
}
- socket->Close();
cancel_tasks_from_user_(user_id);
devices_[index]->UnregisterPhyLayers();
diff --git a/tools/rootcanal/model/setup/test_model.h b/tools/rootcanal/model/setup/test_model.h
index dd9681503c..99138a845d 100644
--- a/tools/rootcanal/model/setup/test_model.h
+++ b/tools/rootcanal/model/setup/test_model.h
@@ -25,21 +25,16 @@
#include <vector> // for vector
#include "hci/address.h" // for Address
+#include "model/devices/hci_socket_device.h" // for HciSocketDevice
#include "model/setup/async_manager.h" // for AsyncUserId, AsyncTaskId
-#include "net/async_data_channel.h" // for AsyncDataChannel
-#include "net/async_data_channel_connector.h" // for AsyncDataChannelConnector
#include "phy.h" // for Phy, Phy::Type
#include "phy_layer_factory.h" // for PhyLayerFactory
-#include "test_channel_transport.h" // for AsyncDataChannel
namespace rootcanal {
class Device;
using ::bluetooth::hci::Address;
-using android::net::AsyncDataChannel;
-using android::net::AsyncDataChannelConnector;
-
class TestModel {
public:
TestModel(
@@ -52,7 +47,7 @@ class TestModel {
periodicEvtScheduler,
std::function<void(AsyncUserId)> cancel_user_tasks,
std::function<void(AsyncTaskId)> cancel,
- std::function<std::shared_ptr<AsyncDataChannel>(const std::string&, int)>
+ std::function<std::shared_ptr<Device>(const std::string&, int, Phy::Type)>
connect_to_remote);
~TestModel() = default;
@@ -80,17 +75,11 @@ class TestModel {
void DelDeviceFromPhy(size_t device_index, size_t phy_index);
// Handle incoming remote connections
- void AddLinkLayerConnection(std::shared_ptr<AsyncDataChannel> socket_fd,
- Phy::Type phy_type);
- void IncomingLinkLayerConnection(std::shared_ptr<AsyncDataChannel> socket_fd);
- void IncomingLinkBleLayerConnection(
- std::shared_ptr<AsyncDataChannel> socket_fd);
- void IncomingHciConnection(std::shared_ptr<AsyncDataChannel> socket_fd,
- std::string properties_filename = "");
+ void AddLinkLayerConnection(std::shared_ptr<Device> dev, Phy::Type phy_type);
+ void AddHciConnection(std::shared_ptr<HciSocketDevice> dev);
// Handle closed remote connections (both hci & link layer)
- void OnConnectionClosed(std::shared_ptr<AsyncDataChannel> socket_fd,
- size_t index, AsyncUserId user_id);
+ void OnConnectionClosed(size_t index, AsyncUserId user_id);
// Connect to a remote device
void AddRemote(const std::string& server, int port, Phy::Type phy_type);
@@ -125,14 +114,12 @@ class TestModel {
schedule_periodic_task_;
std::function<void(AsyncTaskId)> cancel_task_;
std::function<void(AsyncUserId)> cancel_tasks_from_user_;
- std::function<std::shared_ptr<AsyncDataChannel>(const std::string&, int)>
+ std::function<std::shared_ptr<Device>(const std::string&, int, Phy::Type)>
connect_to_remote_;
AsyncUserId model_user_id_;
AsyncTaskId timer_tick_task_{kInvalidTaskId};
std::chrono::milliseconds timer_period_{};
-
- std::shared_ptr<AsyncDataChannelConnector> socket_connector_;
};
} // namespace rootcanal
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 18:56:59 +0000