Skip to content

Fixes a key error when updating presence bit in dictionary #11

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

Open
adriangranados wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes a key error when updating presence bit in dictionary #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6b4ba5
Fixes a key error when updating presence bit in dictionary
adriangranados May 6, 2023
f376b1f
Cleanup (removed unused function args and vars)
adriangranados May 6, 2023
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
14 changes: 6 additions & 8 deletions radiotap/radiotap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def _present_bits(bitmap):
count += 32
offset += 4

def _add_fields(d, namespace, fields):
def _add_fields(d, fields):
if not fields:
return

Expand All @@ -290,12 +290,12 @@ def _add_fields(d, namespace, fields):
else:
d.update(fields)

def _add_vendor_presence_bit(d, oui, bit):
def _add_vendor_presence_bit(d, bit):

if isinstance(d, list):
tgt = d[-1]
else:
tgt = d[oui]
tgt = d
tgt['present'] |= 1 << bit

def radiotap_parse(packet, valuelist=False):
Expand Down Expand Up @@ -329,22 +329,20 @@ def radiotap_parse(packet, valuelist=False):

radiotap = [] if valuelist else {}

vendor_ns = None
for namespace, i in _present_bits(packet[present_offset:offset]):
if i is None:
# namespace switch; if vendor switch to vendor namespace
if namespace == 'vendor':
offset, fields = _parse_vendor(packet, offset)
vendor_ns = fields['oui']
_add_fields(radiotap, vendor_ns, fields)
_add_fields(radiotap, fields)
continue

elif namespace == 'vendor':
# just track the presence bit...
_add_vendor_presence_bit(radiotap, vendor_ns, i)
_add_vendor_presence_bit(radiotap, i)

offset, fields = _parse_radiotap_field(namespace, i, packet, offset)
_add_fields(radiotap, namespace, fields)
_add_fields(radiotap, fields)
if offset == radiotap_len or offset is None:
break

Expand Down