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

Commit 3d237dee authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge "Use proper PBF boundary for upper layer packets"

parents 09063026 4ad0551c

system/gd/hci/acl_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ struct AclManager::impl { 


  void buffer_packet() {

    unregister_all_connections();

    PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::COMPLETE_PDU;

    PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE;

    BroadcastFlag broadcast_flag = BroadcastFlag::POINT_TO_POINT;

    //   Wrap packet and enqueue it

    uint16_t handle = current_connection_pair_->first;

system/gd/hci/cert/cert.cc

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ class AclManagerCertService : public AclManagerCert::Service { 
      return ::grpc::Status(::grpc::StatusCode::INVALID_ARGUMENT, "Invalid address");

    }



    constexpr PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::COMPLETE_PDU;

    constexpr PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE;

    constexpr BroadcastFlag broadcast_flag = BroadcastFlag::POINT_TO_POINT;

    std::unique_ptr<RawBuilder> packet = std::make_unique<RawBuilder>();

    auto req_string = request->payload();

system/gd/hci/hci_layer_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ TEST_F(HciTest, createConnectionTest) { 
  ASSERT_EQ(encryption_enabled, connection_complete_view.GetEncryptionEnabled());



  // Send an ACL packet from the remote

  PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::COMPLETE_PDU;

  PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE;

  BroadcastFlag broadcast_flag = BroadcastFlag::POINT_TO_POINT;

  auto acl_payload = std::make_unique<RawBuilder>();

  acl_payload->AddAddress(bd_addr);
@@ -645,7 +645,7 @@ TEST_F(HciTest, createConnectionTest) { 
  ASSERT_EQ(handle, itr.extract<uint16_t>());



  // Send an ACL packet from DependsOnHci

  PacketBoundaryFlag packet_boundary_flag2 = PacketBoundaryFlag::COMPLETE_PDU;

  PacketBoundaryFlag packet_boundary_flag2 = PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE;

  BroadcastFlag broadcast_flag2 = BroadcastFlag::POINT_TO_POINT;

  auto acl_payload2 = std::make_unique<RawBuilder>();

  acl_payload2->AddOctets2(handle);
@@ -671,7 +671,7 @@ TEST_F(HciTest, receiveMultipleAclPackets) { 
  ASSERT_TRUE(Address::FromString("A1:A2:A3:A4:A5:A6", bd_addr));

  uint16_t handle = 0x0001;

  uint16_t num_packets = 100;

  PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::COMPLETE_PDU;

  PacketBoundaryFlag packet_boundary_flag = PacketBoundaryFlag::FIRST_AUTOMATICALLY_FLUSHABLE;

  BroadcastFlag broadcast_flag = BroadcastFlag::POINT_TO_POINT;

  for (uint16_t i = 0; i < num_packets; i++) {

    auto acl_payload = std::make_unique<RawBuilder>();

system/gd/hci/hci_packets.pdl

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ enum PacketBoundaryFlag : 2 { 
  FIRST_NON_AUTOMATICALLY_FLUSHABLE = 0,

  CONTINUING_FRAGMENT = 1,

  FIRST_AUTOMATICALLY_FLUSHABLE = 2,

  COMPLETE_PDU = 3,

}



enum BroadcastFlag : 2 {