Skip to content

Bluetooth: Make EIR_AdvertisingInterval variable length #4711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025
Merged

Bluetooth: Make EIR_AdvertisingInterval variable length #4711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion scapy/layers/bluetooth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
XLEIntField,
LEMACField,
BitEnumField,
LEThreeBytesField,
)
from scapy.supersocket import SuperSocket
from scapy.sendrecv import sndrcv
Expand Down Expand Up @@ -1266,7 +1267,19 @@ class EIR_PublicTargetAddress(EIR_Element):
class EIR_AdvertisingInterval(EIR_Element):
name = "Advertising Interval"
fields_desc = [
LEShortField("advertising_interval", 0)
MultipleTypeField(
[
(ByteField("advertising_interval", 0),
lambda p: p.underlayer.len - 1 == 1),
(LEShortField("advertising_interval", 0),
lambda p: p.underlayer.len - 1 == 2),
(LEThreeBytesField("advertising_interval", 0),
lambda p: p.underlayer.len - 1 == 3),
(LEIntField("advertising_interval", 0),
lambda p: p.underlayer.len - 1 == 4),
],
LEShortField("advertising_interval", 0)
)
]


Expand Down
4 changes: 4 additions & 0 deletions test/scapy/layers/bluetooth.uts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,10 @@ p = HCI_Event_Hdr(hex_bytes('3e23020100002e4961121110170201060f0954656c655361742
assert EIR_AdvertisingInterval in p
assert p[EIR_AdvertisingInterval].advertising_interval == 400

p = BTLE(hex_bytes('d6be898e20234fe761e5b754021a1803030a18020ace12fffa07104a2b010000000054b7e561e74f00000000'))
assert EIR_AdvertisingInterval in p
assert p[EIR_AdvertisingInterval].advertising_interval == 24

= Parse EIR_LEBluetoothDeviceAddress
p = HCI_Event_Hdr(hex_bytes("3e2a02010000d93519d7ba4c1e0201020affc4000734151317fd80081b00d93519d7ba4c0303b9fe020ad4ad"))
assert EIR_LEBluetoothDeviceAddress in p
Expand Down
Loading