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

Commit abdac7c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "rootcanal-role-switch" am: 7a0cb871 am: 2e2e92b4... 

Merge changes from topic "rootcanal-role-switch" am: 7a0cb871 am: 2e2e92b4 am: 6e919f23 am: 09577e90

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2505565



Change-Id: I89db1e9d541b378452c915614e44dde3e3741fff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3c42071 09577e90

tools/rootcanal/model/controller/acl_connection_handler.cc

+8 −2
Original line number Diff line number Diff line
@@ -55,14 +55,16 @@ uint16_t AclConnectionHandler::GetUnusedHandle() { 
  return unused_handle;

}



bool AclConnectionHandler::CreatePendingConnection(

    Address addr, bool authenticate_on_connect) {

bool AclConnectionHandler::CreatePendingConnection(Address addr,

                                                   bool authenticate_on_connect,

                                                   bool allow_role_switch) {

  if (classic_connection_pending_) {

    return false;

  }

  classic_connection_pending_ = true;

  pending_connection_address_ = addr;

  authenticate_pending_classic_connection_ = authenticate_on_connect;

  pending_classic_connection_allow_role_switch_ = allow_role_switch;

  return true;

}
@@ -622,4 +624,8 @@ bool AclConnectionHandler::HasLinkExpired(uint16_t handle) const { 
  return acl_connections_.at(handle).HasExpired();

}



bool AclConnectionHandler::IsRoleSwitchAllowedForPendingConnection() const {

  return pending_classic_connection_allow_role_switch_;

}



}  // namespace rootcanal

tools/rootcanal/model/controller/acl_connection_handler.h

+4 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ class AclConnectionHandler { 
  void Reset(std::function<void(TaskId)> stopStream);



  bool CreatePendingConnection(bluetooth::hci::Address addr,

                               bool authenticate_on_connect);

                               bool authenticate_on_connect,

                               bool allow_role_switch);

  bool HasPendingConnection(bluetooth::hci::Address addr) const;

  bool CancelPendingConnection(bluetooth::hci::Address addr);

  bool AuthenticatePendingConnection() const;
@@ -151,6 +152,7 @@ class AclConnectionHandler { 
  std::chrono::steady_clock::duration TimeUntilLinkExpired(

      uint16_t handle) const;

  bool HasLinkExpired(uint16_t handle) const;

  bool IsRoleSwitchAllowedForPendingConnection() const;



 private:

  std::unordered_map<uint16_t, AclConnection> acl_connections_;
@@ -160,6 +162,7 @@ class AclConnectionHandler { 
  bluetooth::hci::Address pending_connection_address_{

      bluetooth::hci::Address::kEmpty};

  bool authenticate_pending_classic_connection_{false};

  bool pending_classic_connection_allow_role_switch_{false};

  bool le_connection_pending_{false};

  bluetooth::hci::AddressWithType pending_le_connection_address_{

      bluetooth::hci::Address::kEmpty,

tools/rootcanal/model/controller/link_layer_controller.cc

+97 −9
Original line number Diff line number Diff line
@@ -1817,6 +1817,12 @@ void LinkLayerController::IncomingPacket( 
    case model::packets::PacketType::PING_RESPONSE:

      // ping responses require no action

      break;

    case model::packets::PacketType::ROLE_SWITCH_REQUEST:

      IncomingRoleSwitchRequest(incoming);

      break;

    case model::packets::PacketType::ROLE_SWITCH_RESPONSE:

      IncomingRoleSwitchResponse(incoming);

      break;

    default:

      LOG_WARN("Dropping unhandled packet of type %s",

               model::packets::PacketTypeText(incoming.GetType()).c_str());
@@ -4724,9 +4730,11 @@ void LinkLayerController::IncomingPagePacket( 
  ASSERT(page.IsValid());

  LOG_INFO("from %s", incoming.GetSourceAddress().ToString().c_str());



  bool allow_role_switch = page.GetAllowRoleSwitch();

  if (!connections_.CreatePendingConnection(

          incoming.GetSourceAddress(),

          authentication_enable_ == AuthenticationEnable::REQUIRED)) {

          authentication_enable_ == AuthenticationEnable::REQUIRED,

          allow_role_switch)) {

    // Send a response to indicate that we're busy, or drop the packet?

    LOG_WARN("Failed to create a pending connection for %s",

             incoming.GetSourceAddress().ToString().c_str());
@@ -4778,10 +4786,27 @@ void LinkLayerController::IncomingPageResponsePacket( 


  CheckExpiringConnection(handle);



  auto addr = incoming.GetSourceAddress();

  auto response = model::packets::PageResponseView::Create(incoming);

  ASSERT(response.IsValid());

  /* Role change event before connection complete is a quirk commonly exists in

   * Android-capatable Bluetooth controllers.

   * On the initiator side, only connection in peripheral role should be

   * accompanied with a role change event */

  // TODO(b/274476773): Add a config option for this quirk

  if (connections_.IsRoleSwitchAllowedForPendingConnection() &&

      response.GetTryRoleSwitch()) {

    auto role = bluetooth::hci::Role::PERIPHERAL;

    connections_.SetAclRole(handle, role);

    if (IsEventUnmasked(EventCode::ROLE_CHANGE)) {

      send_event_(bluetooth::hci::RoleChangeBuilder::Create(ErrorCode::SUCCESS,

                                                            addr, role));

    }

  }

  if (IsEventUnmasked(EventCode::CONNECTION_COMPLETE)) {

    send_event_(bluetooth::hci::ConnectionCompleteBuilder::Create(

        ErrorCode::SUCCESS, handle, incoming.GetSourceAddress(),

        bluetooth::hci::LinkType::ACL, bluetooth::hci::Enable::DISABLED));

        ErrorCode::SUCCESS, handle, addr, bluetooth::hci::LinkType::ACL,

        bluetooth::hci::Enable::DISABLED));

  }



#ifndef ROOTCANAL_LMP
@@ -5384,6 +5409,21 @@ void LinkLayerController::MakePeripheralConnection(const Address& addr, 


  CheckExpiringConnection(handle);



  /* Role change event before connection complete is a quirk commonly exists in

   * Android-capatable Bluetooth controllers.

   * On the responder side, any connection should be accompanied with a role

   * change event */

  // TODO(b/274476773): Add a config option for this quirk

  auto role =

      try_role_switch && connections_.IsRoleSwitchAllowedForPendingConnection()

          ? bluetooth::hci::Role::CENTRAL

          : bluetooth::hci::Role::PERIPHERAL;

  connections_.SetAclRole(handle, role);

  if (IsEventUnmasked(EventCode::ROLE_CHANGE)) {

    send_event_(bluetooth::hci::RoleChangeBuilder::Create(ErrorCode::SUCCESS,

                                                          addr, role));

  }



  LOG_INFO("CreateConnection returned handle 0x%x", handle);

  if (IsEventUnmasked(EventCode::CONNECTION_COMPLETE)) {

    send_event_(bluetooth::hci::ConnectionCompleteBuilder::Create(
@@ -5426,7 +5466,8 @@ ErrorCode LinkLayerController::CreateConnection(const Address& addr, 
                                                uint16_t /* clock_offset */,

                                                uint8_t allow_role_switch) {

  if (!connections_.CreatePendingConnection(

          addr, authentication_enable_ == AuthenticationEnable::REQUIRED)) {

          addr, authentication_enable_ == AuthenticationEnable::REQUIRED,

          allow_role_switch)) {

    return ErrorCode::CONTROLLER_BUSY;

  }
@@ -5629,12 +5670,59 @@ ErrorCode LinkLayerController::SwitchRole(Address addr, 
  if (handle == rootcanal::kReservedHandle) {

    return ErrorCode::UNKNOWN_CONNECTION;

  }

  connections_.SetAclRole(handle, role);

  ScheduleTask(kNoDelayMs, [this, addr, role]() {

  // TODO(b/274248798): Reject role switch if disabled in link policy

  SendLinkLayerPacket(model::packets::RoleSwitchRequestBuilder::Create(

      GetAddress(), addr, static_cast<uint8_t>(role)));

  return ErrorCode::SUCCESS;

}



void LinkLayerController::IncomingRoleSwitchRequest(

    model::packets::LinkLayerPacketView incoming) {

  auto addr = incoming.GetSourceAddress();

  auto handle = connections_.GetHandleOnlyAddress(addr);

  auto request = model::packets::RoleSwitchRequestView::Create(incoming);

  ASSERT(request.IsValid());



  // TODO(b/274248798): Reject role switch if disabled in link policy

  Role remote_role = static_cast<Role>(request.GetInitiatorNewRole());

  Role local_role =

      remote_role == Role::CENTRAL ? Role::PERIPHERAL : Role::CENTRAL;

  connections_.SetAclRole(handle, local_role);

  if (IsEventUnmasked(EventCode::ROLE_CHANGE)) {

    ScheduleTask(kNoDelayMs, [this, addr, local_role]() {

      send_event_(bluetooth::hci::RoleChangeBuilder::Create(ErrorCode::SUCCESS,

                                                          addr, role));

                                                            addr, local_role));

    });

  return ErrorCode::SUCCESS;

  }

  ScheduleTask(kNoDelayMs, [this, addr, remote_role]() {

    SendLinkLayerPacket(model::packets::RoleSwitchResponseBuilder::Create(

        GetAddress(), addr, static_cast<uint8_t>(ErrorCode::SUCCESS),

        static_cast<uint8_t>(remote_role)));

  });

}



void LinkLayerController::IncomingRoleSwitchResponse(

    model::packets::LinkLayerPacketView incoming) {

  auto addr = incoming.GetSourceAddress();

  auto handle = connections_.GetHandleOnlyAddress(addr);

  auto response = model::packets::RoleSwitchResponseView::Create(incoming);

  ASSERT(response.IsValid());



  // TODO(b/274248798): Reject role switch if disabled in link policy

  ErrorCode status = ErrorCode::SUCCESS;

  Role role = static_cast<Role>(response.GetInitiatorNewRole());

  if (response.GetStatus() == static_cast<uint8_t>(ErrorCode::SUCCESS)) {

    connections_.SetAclRole(handle, role);

  } else {

    status = static_cast<ErrorCode>(response.GetStatus());

  }



  if (IsEventUnmasked(EventCode::ROLE_CHANGE)) {

    ScheduleTask(kNoDelayMs, [this, status, addr, role]() {

      send_event_(

          bluetooth::hci::RoleChangeBuilder::Create(status, addr, role));

    });

  }

}



ErrorCode LinkLayerController::ReadLinkPolicySettings(uint16_t handle,

tools/rootcanal/model/controller/link_layer_controller.h

+2 −0
Original line number Diff line number Diff line
@@ -680,6 +680,8 @@ class LinkLayerController { 
  void IncomingScoDisconnect(model::packets::LinkLayerPacketView incoming);



  void IncomingPingRequest(model::packets::LinkLayerPacketView incoming);

  void IncomingRoleSwitchRequest(model::packets::LinkLayerPacketView incoming);

  void IncomingRoleSwitchResponse(model::packets::LinkLayerPacketView incoming);



 public:

  bool IsEventUnmasked(bluetooth::hci::EventCode event) const;

tools/rootcanal/packets/link_layer_packets.pdl

+11 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ enum PacketType : 8 { 


    PING_REQUEST = 0x35,

    PING_RESPONSE = 0x36,

    ROLE_SWITCH_REQUEST = 0x38,

    ROLE_SWITCH_RESPONSE = 0x39,

}



packet LinkLayerPacket {
@@ -455,3 +457,12 @@ packet PingRequest : LinkLayerPacket (type = PING_REQUEST) { 


packet PingResponse : LinkLayerPacket (type = PING_RESPONSE) {

}



packet RoleSwitchRequest : LinkLayerPacket (type = ROLE_SWITCH_REQUEST) {

  initiator_new_role: 8,

}



packet RoleSwitchResponse : LinkLayerPacket (type = ROLE_SWITCH_RESPONSE) {

  status: 8,

  initiator_new_role: 8,

}