bluetooth: extract UUIDs and manufacturer data from advertisements - #633
Merged
kismetwireless merged 1 commit intoSep 17, 2026
Merged
Conversation
…ments Both Bluetooth-capable phys (phy_btle.cc, phy_bluetooth.cc) already parse each advertisement's Advertising Data structures for the device name and flags; this adds parsing of the remaining AD types (16/32/128- bit service UUIDs, Manufacturer Specific Data) from that same already-received data. phy_btle.cc extends its own AD walk with new tracked fields (service_uuid_vec, manuf_company_id, manuf_data). The classic/mgmt-API Bluetooth phy gets the same fields via new capture_linux_bluetooth.c helpers (eir_get_uuids_json/eir_get_manuf) that parse the EIR buffer already read for the device name, forwarded to phy_bluetooth.cc through an extended JSON payload.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Both Bluetooth-capable phys (phy_btle.cc, phy_bluetooth.cc) already parse each advertisement's Advertising Data structures for the device name and flags; this adds parsing of the remaining AD types (16/32/128- bit service UUIDs, Manufacturer Specific Data) from the same already-received data.
phy_btle.cc extends its own AD walk with new tracked fields (service_uuid_vec, manuf_company_id, manuf_data). The classic/mgmt-API Bluetooth phy gets the same fields via new capture_linux_bluetooth.c helpers (eir_get_uuids_json/eir_get_manuf) that parse the EIR buffer already read for the device name, forwarded to phy_bluetooth.cc through an extended JSON payload.
Field tested live with with sniffle flashed Sonoff ZBDongle-P interface and Alfa AWUS036AXML.
Extended BTLE data is now stored in device json here:
btle.device.service_uuid_vec
btle.device.manuf_company_id
btle.device.manuf_data
Bluetooth classic is stored here:
bluetooth.device.service_uuid_strs
bluetooth.device.manuf_company_id
bluetooth.device.manuf_data