Skip to content

Commit 535fc33

Browse files
bluetooth: Add EIR public target address (#4603)
1 parent 4fbf6fb commit 535fc33

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

scapy/layers/bluetooth.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,13 @@ def extract_padding(self, s):
12321232
return s[:plen], s[plen:]
12331233

12341234

1235+
class EIR_PublicTargetAddress(EIR_Element):
1236+
name = "Public Target Address"
1237+
fields_desc = [
1238+
LEMACField('bd_addr', None)
1239+
]
1240+
1241+
12351242
class EIR_ServiceData32BitUUID(EIR_Element):
12361243
name = 'EIR Service Data - 32-bit UUID'
12371244
fields_desc = [
@@ -2342,6 +2349,7 @@ class HCI_LE_Meta_Long_Term_Key_Request(Packet):
23422349
bind_layers(EIR_Hdr, EIR_SecurityManagerOOBFlags, type=0x11)
23432350
bind_layers(EIR_Hdr, EIR_PeripheralConnectionIntervalRange, type=0x12)
23442351
bind_layers(EIR_Hdr, EIR_ServiceData16BitUUID, type=0x16)
2352+
bind_layers(EIR_Hdr, EIR_PublicTargetAddress, type=0x17)
23452353
bind_layers(EIR_Hdr, EIR_ServiceData32BitUUID, type=0x20)
23462354
bind_layers(EIR_Hdr, EIR_ServiceData128BitUUID, type=0x21)
23472355
bind_layers(EIR_Hdr, EIR_Manufacturer_Specific_Data, type=0xff)

test/scapy/layers/bluetooth.uts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,11 @@ assert p[EIR_ClassOfDevice].major_service_classes == 0
471471
assert p[EIR_ClassOfDevice].major_device_class == 5
472472
assert p[EIR_ClassOfDevice].minor_device_class == 1
473473

474+
= Parse EIR_PublicTargetAddress
475+
p = HCI_Hdr(hex_bytes('043e1402010001554433221100080717ffeeddccbbaaaa'))
476+
assert EIR_PublicTargetAddress in p
477+
assert p[EIR_PublicTargetAddress].bd_addr == 'aa:bb:cc:dd:ee:ff'
478+
474479
= Parse EIR_ServiceData32BitUUID
475480

476481
p = HCI_Hdr(hex_bytes('042fff01c47c80894df801000c0128a269a30c4a125d13f30196894df80c012820f61a1a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'))

0 commit comments

Comments
 (0)