Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d73c8f1f authored by Henri Chataing's avatar Henri Chataing
Browse files

RootCanal: Fix bd address used for HCI sniffer file names 

Regression introduced in I8d59dca134a2a10e85073d1b7d6ed8c2e41e783c
Because the device is added in an async event, the device address
is not available when the PCAP file is opened, and the default
bluetooth address is used.

Bug: 278891939
Test: ./root-canal --enable_hci_sniffer
Change-Id: Ic3eed88575a5b9180e0b42f798a305a26e59721a
parent e1e32a6f

tools/rootcanal/desktop/test_environment.cc

+27 −21
Original line number Diff line number Diff line
@@ -98,13 +98,17 @@ void TestEnvironment::SetUpHciServer( 
  server->SetOnConnectCallback([this, properties = std::move(properties)](

                                   std::shared_ptr<AsyncDataChannel> socket,

                                   AsyncDataChannelServer* server) {

    // AddHciConnection needs to be executed in task thread to

    // prevent data races on test model.

    async_manager_.ExecAsync(socket_user_id_, std::chrono::milliseconds(0),

                             [=]() {

      auto transport = HciSocketTransport::Create(socket);

      if (enable_hci_sniffer_) {

        transport = HciSniffer::Create(transport);

      }

      auto device = HciDevice::Create(transport, properties);

    async_manager_.ExecAsync(socket_user_id_, std::chrono::milliseconds(0),

                             [=]() { test_model_.AddHciConnection(device); });

      test_model_.AddHciConnection(device);



      if (enable_hci_sniffer_) {

        auto filename = device->GetAddress().ToString() + ".pcap";

        for (auto i = 0; std::filesystem::exists(filename); i++) {
@@ -124,6 +128,8 @@ void TestEnvironment::SetUpHciServer( 
          sniffer->SetPcapFilter(std::make_shared<rootcanal::PcapFilter>());

        }

      }

    });



    server->StartListening();

  });

  hci_socket_servers_.emplace_back(std::move(server));