Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with aosp/main #29

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Sync with aosp/main #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions desktop/test_environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,15 @@ void TestEnvironment::SetUpHciServer(
transport = HciSniffer::Create(transport);
}
auto device = HciDevice::Create(transport, properties);
test_model_.AddHciConnection(device);
auto device_id = test_model_.AddHciConnection(device);

if (enable_hci_sniffer_) {
auto filename = device->GetAddress().ToString() + ".pcap";
auto filename = "rootcanal_" + std::to_string(device_id) + "_" +
device->GetAddress().ToString() + ".pcap";
for (auto i = 0; std::filesystem::exists(filename); i++) {
filename =
device->GetAddress().ToString() + "_" + std::to_string(i) + ".pcap";
filename = "rootcanal_" + std::to_string(device_id) + "_" +
device->GetAddress().ToString() + "_" + std::to_string(i) +
".pcap";
}
auto file = std::make_shared<std::ofstream>(filename, std::ios::binary);
auto sniffer = std::static_pointer_cast<HciSniffer>(transport);
Expand Down
9 changes: 8 additions & 1 deletion model/controller/link_layer_controller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3166,6 +3166,8 @@ void LinkLayerController::ScanIncomingLeLegacyAdvertisingPdu(
// is connectable in the scan response report.
scanner_.connectable_scan_response = connectable_advertising;
scanner_.extended_scan_response = false;
scanner_.primary_scan_response_phy = model::packets::PhyType::LE_1M;
scanner_.secondary_scan_response_phy = model::packets::PhyType::NO_PACKETS;
scanner_.pending_scan_request = advertising_address;
scanner_.pending_scan_request_timeout =
std::chrono::steady_clock::now() + kScanRequestTimeout;
Expand Down Expand Up @@ -3622,6 +3624,8 @@ void LinkLayerController::ScanIncomingLeExtendedAdvertisingPdu(
// is connectable in the scan response report.
scanner_.connectable_scan_response = connectable_advertising;
scanner_.extended_scan_response = true;
scanner_.primary_scan_response_phy = primary_phy;
scanner_.secondary_scan_response_phy = secondary_phy;
scanner_.pending_scan_request = advertising_address;

INFO(id_,
Expand Down Expand Up @@ -4999,7 +5003,10 @@ void LinkLayerController::IncomingLeScanResponsePacket(
response.scannable_ = true;
response.legacy_ = !scanner_.extended_scan_response;
response.scan_response_ = true;
response.primary_phy_ = bluetooth::hci::PrimaryPhyType::LE_1M;
response.primary_phy_ = static_cast<bluetooth::hci::PrimaryPhyType>(
scanner_.primary_scan_response_phy);
response.secondary_phy_ = static_cast<bluetooth::hci::SecondaryPhyType>(
scanner_.secondary_scan_response_phy);
// TODO: SID should be set in scan response PDU
response.advertising_sid_ = 0xFF;
response.tx_power_ = 0x7F;
Expand Down
2 changes: 2 additions & 0 deletions model/controller/link_layer_controller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,8 @@ class LinkLayerController {
// Save information about the advertising PDU being scanned.
bool connectable_scan_response;
bool extended_scan_response;
model::packets::PhyType primary_scan_response_phy;
model::packets::PhyType secondary_scan_response_phy;
std::optional<AddressWithType> pending_scan_request{};
std::optional<std::chrono::steady_clock::time_point>
pending_scan_request_timeout{};
Expand Down
3 changes: 2 additions & 1 deletion test/LL/DDI/ADV/BV_11_C.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ async def test(self):
advertising_address_type=ll.AddressType.PUBLIC,
conn_interval=self.LL_initiator_connInterval,
conn_peripheral_latency=self.LL_initiator_connPeripheralLatency,
conn_supervision_timeout=self.LL_initiator_connSupervisionTimeout))
conn_supervision_timeout=self.LL_initiator_connSupervisionTimeout),
ignored_pdus=[ll.LeLegacyAdvertisingPdu])

# 11. Upper Tester receives an HCI_LE_Connection_Complete event from the IUT including the
# parameters sent to the IUT in step 8.
Expand Down
Loading