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

Commit 28790525 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Root-Canal: Forward SCO packets to peer am: 0d96948d 

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

Change-Id: I46468598eaab4b72faba9c0337edf79647e3fb2f
parents bee726f9 0d96948d

system/vendor_libs/test_vendor_lib/model/controller/dual_mode_controller.cc

+4 −0
Original line number Diff line number Diff line
@@ -355,8 +355,10 @@ void DualModeController::HandleAcl(std::shared_ptr<std::vector<uint8_t>> packet) 
void DualModeController::HandleSco(std::shared_ptr<std::vector<uint8_t>> packet) {

  bluetooth::hci::PacketView<bluetooth::hci::kLittleEndian> raw_packet(packet);

  auto sco_packet = bluetooth::hci::ScoView::Create(raw_packet);

  ASSERT(sco_packet.IsValid());

  if (loopback_mode_ == LoopbackMode::ENABLE_LOCAL) {

    uint16_t handle = sco_packet.GetHandle();



    auto sco_builder = bluetooth::hci::ScoBuilder::Create(

        handle, sco_packet.GetPacketStatusFlag(), sco_packet.GetData());

    send_sco_(std::move(sco_builder));
@@ -371,6 +373,8 @@ void DualModeController::HandleSco(std::shared_ptr<std::vector<uint8_t>> packet) 
    }

    return;

  }



  link_layer_controller_.SendScoToRemote(sco_packet);

}



void DualModeController::HandleIso(

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.cc

+54 −10
Original line number Diff line number Diff line
@@ -195,6 +195,26 @@ ErrorCode LinkLayerController::SendAclToRemote( 
  return ErrorCode::SUCCESS;

}



ErrorCode LinkLayerController::SendScoToRemote(

    bluetooth::hci::ScoView sco_packet) {



  uint16_t handle = sco_packet.GetHandle();

  if (!connections_.HasScoHandle(handle)) {

    return ErrorCode::UNKNOWN_CONNECTION;

  }



  // TODO: SCO flow control

  Address source = properties_.GetAddress();

  Address destination = connections_.GetScoAddress(handle);



  auto sco_data = sco_packet.GetData();

  std::vector<uint8_t> sco_data_bytes(sco_data.begin(), sco_data.end());



  SendLinkLayerPacket(model::packets::ScoBuilder::Create(

      source, destination, std::make_unique<bluetooth::packet::RawBuilder>(sco_data_bytes)));

  return ErrorCode::SUCCESS;

}



void LinkLayerController::IncomingPacket(

    model::packets::LinkLayerPacketView incoming) {

  ASSERT(incoming.IsValid());
@@ -244,6 +264,9 @@ void LinkLayerController::IncomingPacket( 
    case model::packets::PacketType::ACL:

      IncomingAclPacket(incoming);

      break;

    case model::packets::PacketType::SCO:

      IncomingScoPacket(incoming);

      break;

    case model::packets::PacketType::DISCONNECT:

      IncomingDisconnectPacket(incoming);

      break;
@@ -380,10 +403,6 @@ void LinkLayerController::IncomingPacket( 
    case (model::packets::PacketType::READ_CLOCK_OFFSET_RESPONSE):

      IncomingReadClockOffsetResponse(incoming);

      break;



    case model::packets::PacketType::SCO:

      LOG_WARN("ignoring SCO packet");

      break;

    case model::packets::PacketType::SCO_CONNECTION_REQUEST:

      IncomingScoConnectionRequest(incoming);

      break;
@@ -402,9 +421,6 @@ void LinkLayerController::IncomingPacket( 


void LinkLayerController::IncomingAclPacket(

    model::packets::LinkLayerPacketView incoming) {

  LOG_INFO("Acl Packet %s -> %s",

           incoming.GetSourceAddress().ToString().c_str(),

           incoming.GetDestinationAddress().ToString().c_str());



  auto acl = model::packets::AclView::Create(incoming);

  ASSERT(acl.IsValid());
@@ -412,16 +428,18 @@ void LinkLayerController::IncomingAclPacket( 
  std::shared_ptr<std::vector<uint8_t>> payload_bytes =

      std::make_shared<std::vector<uint8_t>>(payload.begin(), payload.end());



  LOG_INFO("Acl Packet [%d] %s -> %s",

           static_cast<int>(payload_bytes->size()),

           incoming.GetSourceAddress().ToString().c_str(),

           incoming.GetDestinationAddress().ToString().c_str());



  bluetooth::hci::PacketView<bluetooth::hci::kLittleEndian> raw_packet(

      payload_bytes);

  auto acl_view = bluetooth::hci::AclView::Create(raw_packet);

  ASSERT(acl_view.IsValid());



  LOG_INFO("Remote handle 0x%x size %d", acl_view.GetHandle(),

           static_cast<int>(acl_view.size()));

  uint16_t local_handle =

      connections_.GetHandleOnlyAddress(incoming.GetSourceAddress());

  LOG_INFO("Local handle 0x%x", local_handle);



  std::vector<uint8_t> payload_data(acl_view.GetPayload().begin(),

                                    acl_view.GetPayload().end());
@@ -453,6 +471,32 @@ void LinkLayerController::IncomingAclPacket( 
  }

}



void LinkLayerController::IncomingScoPacket(

    model::packets::LinkLayerPacketView incoming) {





  Address source = incoming.GetSourceAddress();

  uint16_t sco_handle = connections_.GetScoHandle(source);

  if (!connections_.HasScoHandle(sco_handle)) {

      LOG_INFO("Spurious SCO packet from %s", source.ToString().c_str());

      return;

  }



  auto sco = model::packets::ScoView::Create(incoming);

  ASSERT(sco.IsValid());

  auto sco_data = sco.GetPayload();

  std::vector<uint8_t> sco_data_bytes(sco_data.begin(), sco_data.end());



  LOG_INFO("Sco Packet [%d] %s -> %s",

           static_cast<int>(sco_data_bytes.size()),

           incoming.GetSourceAddress().ToString().c_str(),

           incoming.GetDestinationAddress().ToString().c_str());



  send_sco_(bluetooth::hci::ScoBuilder::Create(

      sco_handle, bluetooth::hci::PacketStatusFlag::CORRECTLY_RECEIVED,

      sco_data_bytes));

}



void LinkLayerController::IncomingRemoteNameRequest(

    model::packets::LinkLayerPacketView packet) {

  auto view = model::packets::RemoteNameRequestView::Create(packet);

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.h

+1 −1
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ class LinkLayerController { 
  void SendLinkLayerPacket(

      std::unique_ptr<model::packets::LinkLayerPacketBuilder> packet);

  void IncomingAclPacket(model::packets::LinkLayerPacketView packet);

  void IncomingScoPacket(model::packets::LinkLayerPacketView packet);

  void IncomingDisconnectPacket(model::packets::LinkLayerPacketView packet);

  void IncomingEncryptConnection(model::packets::LinkLayerPacketView packet);

  void IncomingEncryptConnectionResponse(
@@ -460,7 +461,6 @@ class LinkLayerController { 


  // Timing related state

  std::vector<AsyncTaskId> controller_events_;

  AsyncTaskId timer_tick_task_{};

  std::chrono::milliseconds timer_period_ = std::chrono::milliseconds(100);



  // Callbacks to schedule tasks.

system/vendor_libs/test_vendor_lib/packets/link_layer_packets.pdl

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ packet RemoteNameRequestResponse : LinkLayerPacket (type = REMOTE_NAME_REQUEST_R 
  name : 8[248],

}



packet ScoPacket : LinkLayerPacket (type = SCO) {

packet Sco : LinkLayerPacket (type = SCO) {

  _payload_,

}