From 20036f370d61beca19750f03bd7b599cb850d9ce Mon Sep 17 00:00:00 2001 From: gpotter2 Date: Sat, 12 Oct 2019 16:53:29 +0200 Subject: [PATCH] Remove Dot11FCS workaround Scapy 2.4.3+ (pinned for pwnagotchi) has fixed this issue. Signed-off-by: gpotter2 --- pwnagotchi/mesh/advertise.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pwnagotchi/mesh/advertise.py b/pwnagotchi/mesh/advertise.py index 84286d2..a4f88b7 100644 --- a/pwnagotchi/mesh/advertise.py +++ b/pwnagotchi/mesh/advertise.py @@ -3,7 +3,7 @@ import json import _thread import threading 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 @@ -141,13 +141,7 @@ class Advertiser(object): dot11.addr3 != self._me.session_id def _on_packet(self, p): - # https://github.com/secdev/scapy/issues/1590 - if p.haslayer(Dot11): - dot11 = p[Dot11] - elif p.haslayer(Dot11FCS): - dot11 = p[Dot11FCS] - else: - dot11 = None + dot11 = p.getlayer(Dot11) if self._is_broadcasted_advertisement(dot11): try: