Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add BlockAck Request subtype for addr2 conditional field clause (#1175) 

* Fixed parsing of addr2 (TA) for BlockAck Request frames.

* Unit test for addr2 dissect in BlockAck Request frames.
This commit is contained in:
Adrian Granados 2018-02-28 04:11:17 -05:00 committed by Guillaume Valadon
parent 59098e926a
commit e42ecdc545
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scapy/layers/dot11.py
View File

@ -123,7 +123,7 @@ class Dot11(Packet):
ConditionalField(
MACField("addr2", ETHER_ANY),
lambda pkt: (pkt.type != 1 or
pkt.subtype in [0x9, 0xb, 0xa, 0xe, 0xf]),
pkt.subtype in [0x8, 0x9, 0xa, 0xb, 0xe, 0xf]),
),
ConditionalField(
MACField("addr3", ETHER_ANY),

1
test/regression.uts
View File

@ -9378,6 +9378,7 @@ Dot11(type=0, subtype=1).answers(query) == True
= Dot11 - misc
assert Dot11Elt(info="scapy").summary() == "SSID='scapy'"
assert Dot11Elt(ID=1).mysummary() == ""
assert Dot11(b'\x84\x00\x00\x00\x00\x11\x22\x33\x44\x55\x00\x11\x22\x33\x44\x55').addr2 == '00:11:22:33:44:55'
= Multiple Dot11Elt layers
pkt = Dot11() / Dot11Beacon() / Dot11Elt(ID="Rates") / Dot11Elt(ID="SSID", info="Scapy")