Remove Dot11FCS workaround

Scapy 2.4.3+ (pinned for pwnagotchi) has fixed this issue.

Signed-off-by: gpotter2 <gabriel@potter.fr>
This commit is contained in:
gpotter2
2019-10-12 16:53:29 +02:00
parent 80159533bc
commit 20036f370d

View File

@ -3,7 +3,7 @@ import json
import _thread import _thread
import threading import threading
import logging import logging
from scapy.all import Dot11, Dot11FCS, Dot11Elt, RadioTap, sendp, sniff from scapy.all import Dot11, Dot11Elt, RadioTap, sendp, sniff
import pwnagotchi.ui.faces as faces import pwnagotchi.ui.faces as faces
@ -141,13 +141,7 @@ class Advertiser(object):
dot11.addr3 != self._me.session_id dot11.addr3 != self._me.session_id
def _on_packet(self, p): def _on_packet(self, p):
# https://github.com/secdev/scapy/issues/1590 dot11 = p.getlayer(Dot11)
if p.haslayer(Dot11):
dot11 = p[Dot11]
elif p.haslayer(Dot11FCS):
dot11 = p[Dot11FCS]
else:
dot11 = None
if self._is_broadcasted_advertisement(dot11): if self._is_broadcasted_advertisement(dot11):
try: try: