scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-12 19:40:42 +02:00
commit 66e5f89a96
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pwnagotchi/mesh/advertise.py
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: