Skip to content
Snippets Groups Projects
Commit ea0a81b7 authored by Haim Daniel's avatar Haim Daniel Committed by Pierre Lalet
Browse files

Add dot11 block ack support (#440) 

Add missing addr2 to block ack packet, improve addr2 validation performance.
parent ccae4a2c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
scapy/layers/dot11.py
+ 3
− 3
View file @ ea0a81b7
...@@ -43,10 +43,10 @@ class Dot11AddrMACField(MACField): ...@@ -43,10 +43,10 @@ class Dot11AddrMACField(MACField):
return s,None return s,None
class Dot11Addr2MACField(Dot11AddrMACField): class Dot11Addr2MACField(Dot11AddrMACField):
# Block-Ack, RTS, PS-Poll, CF-End, CF-End+CF-Ack
subtypes = {0x9, 0xb, 0xa, 0xe, 0xf}
def is_applicable(self, pkt): def is_applicable(self, pkt):
if pkt.type == 1: return pkt.type != 1 or pkt.subtype in self.subtypes
return pkt.subtype in [ 0xb, 0xa, 0xe, 0xf] # RTS, PS-Poll, CF-End, CF-End+CF-Ack
return 1
class Dot11Addr3MACField(Dot11AddrMACField): class Dot11Addr3MACField(Dot11AddrMACField):
def is_applicable(self, pkt): def is_applicable(self, pkt):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment