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

Commit 5330e0e9 authored by Zach Johnson's avatar Zach Johnson
Browse files

Use new View.FromBytes function available in testing 

This removes the need to manually construct basic
packet views for higher level views.

Test: fuzz/run --host bluetooth_gd_hci_fuzz_test
Change-Id: I51f8bdd933d89dc3d1c7f70e7da71216f16361f4
parent 03fb5108

system/gd/hal/fuzz/fuzz_hci_hal.cc

+4 −8
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ void FuzzHciHal::unregisterIncomingPacketCallback() { 
}



void FuzzHciHal::sendHciCommand(HciPacket packet) {

  auto packetView = packet::PacketView<packet::kLittleEndian>(std::make_shared<std::vector<uint8_t>>(packet));

  hci::CommandPacketView command = hci::CommandPacketView::Create(packetView);

  hci::CommandPacketView command = hci::CommandPacketView::FromBytes(packet);

  if (!command.IsValid()) {

    return;

  }
@@ -42,8 +41,7 @@ void FuzzHciHal::sendHciCommand(HciPacket packet) { 
}



void FuzzHciHal::injectHciEvent(std::vector<uint8_t> data) {

  auto packet = packet::PacketView<packet::kLittleEndian>(std::make_shared<std::vector<uint8_t>>(data));

  hci::EventPacketView event = hci::EventPacketView::Create(packet);

  hci::EventPacketView event = hci::EventPacketView::FromBytes(data);

  if (!event.IsValid()) {

    return;

  }
@@ -70,8 +68,7 @@ void FuzzHciHal::injectHciEvent(std::vector<uint8_t> data) { 
}



void FuzzHciHal::injectAclData(std::vector<uint8_t> data) {

  auto packet = packet::PacketView<packet::kLittleEndian>(std::make_shared<std::vector<uint8_t>>(data));

  hci::AclPacketView aclPacket = hci::AclPacketView::Create(packet);

  hci::AclPacketView aclPacket = hci::AclPacketView::FromBytes(data);

  if (!aclPacket.IsValid()) {

    return;

  }
@@ -80,8 +77,7 @@ void FuzzHciHal::injectAclData(std::vector<uint8_t> data) { 
}



void FuzzHciHal::injectScoData(std::vector<uint8_t> data) {

  auto packet = packet::PacketView<packet::kLittleEndian>(std::make_shared<std::vector<uint8_t>>(data));

  hci::ScoPacketView scoPacket = hci::ScoPacketView::Create(packet);

  hci::ScoPacketView scoPacket = hci::ScoPacketView::FromBytes(data);

  if (!scoPacket.IsValid()) {

    return;

  }

system/gd/hci/fuzz/dev_null_hci.cc

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ void DevNullHci::Stop() { 
}



void DevNullHci::injectAclData(std::vector<uint8_t> data) {

  auto packet = packet::PacketView<packet::kLittleEndian>(std::make_shared<std::vector<uint8_t>>(data));

  hci::AclPacketView aclPacket = hci::AclPacketView::Create(packet);

  hci::AclPacketView aclPacket = hci::AclPacketView::FromBytes(data);

  if (!aclPacket.IsValid()) {

    return;

  }