Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-07-28 18:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix bytes conversion in TSCM BLE scanner

Browse Source 
Handle various data types safely when converting manufacturer_data
in the TSCM-specific BLE scanner module.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Smittix
2026-01-21 23:36:10 +00:00
parent 17a0dddf61
commit eb5bf55aad
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/tscm/ble_scanner.py
+13 -1
View File
@@ -178,7 +178,19 @@ class BLEScanner:
for company_id, data in adv_data.manufacturer_data.items(): for company_id, data in adv_data.manufacturer_data.items():
ble_device.manufacturer_id = company_id ble_device.manufacturer_id = company_id
ble_device.manufacturer_name = COMPANY_IDS.get(company_id, f'Unknown ({hex(company_id)})') ble_device.manufacturer_name = COMPANY_IDS.get(company_id, f'Unknown ({hex(company_id)})')
ble_device.manufacturer_data = bytes(data) # Handle various data types safely
try:
if isinstance(data, (bytes, bytearray)):
ble_device.manufacturer_data = bytes(data)
elif isinstance(data, (list, tuple)):
ble_device.manufacturer_data = bytes(data)
elif isinstance(data, str):
ble_device.manufacturer_data = bytes.fromhex(data)
else:
ble_device.manufacturer_data = bytes(data)
except (TypeError, ValueError) as e:
logger.debug(f"Could not convert manufacturer data: {e}")
ble_device.manufacturer_data = None
# Check for known trackers # Check for known trackers
self._identify_tracker(ble_device, company_id, data) self._identify_tracker(ble_device, company_id, data)