diff --git a/probemon.py b/probemon.py index 6637919..9782b3d 100644 --- a/probemon.py +++ b/probemon.py @@ -6,8 +6,8 @@ import netaddr import sys import logging -from scapy.all import * -from pprint import pprint +from scapy.sendrecv import sniff +from scapy.layers.dot11 import Dot11 from logging.handlers import RotatingFileHandler @@ -45,12 +45,12 @@ def packet_callback(packet): try: parsed_mac = netaddr.EUI(packet.addr2) fields.append(parsed_mac.oui.registration().org) - except netaddr.core.NotRegisteredError, e: + except netaddr.core.NotRegisteredError as e: fields.append('UNKNOWN') # include the SSID in the probe frame if ssid: - fields.append(packet.info) + fields.append(packet.info.decode("utf-8")) if rssi: rssi_val = -(256-ord(packet.notdecoded[-4:-3])) @@ -76,7 +76,7 @@ def main(): args = parser.parse_args() if not args.interface: - print "error: capture interface not given, try --help" + sys.stderr.write("error: capture interface not given, try --help\n") sys.exit(-1) DEBUG = args.debug