diff --git a/py/Airodump.py b/py/Airodump.py index b9648c6..b947c1d 100644 --- a/py/Airodump.py +++ b/py/Airodump.py @@ -195,7 +195,7 @@ class Airodump(object): # The current row corresponds to a "Client" (computer) try: client = Client(row) - except IndexError: + except IndexError, ValueError: # Skip if we can't parse the client row continue diff --git a/py/Bully.py b/py/Bully.py index 5e7888e..dc343fe 100644 --- a/py/Bully.py +++ b/py/Bully.py @@ -170,6 +170,12 @@ class Bully(Attack): if pixie_re: self.state = "{R}Failed{W}" + + # [+] Running pixiewps with the information, wait ... + pixie_re = re.compile(r".*Running pixiewps with the information").match(line) + if pixie_re: + self.state = "{G}Running pixiewps...{W}" + # [*] Pin is '80246213', key is 'password' pin_key_re = re.compile(r"^\s*Pin is '(\d*)', key is '(.*)'\s*$").match(line) if pin_key_re: diff --git a/py/Client.py b/py/Client.py index 1556019..51a6918 100644 --- a/py/Client.py +++ b/py/Client.py @@ -22,8 +22,8 @@ class Client(object): 6 Probed ESSIDs ''' self.station = fields[0].strip() - self.power = int(fields[3].strip()) if fields[3].strip().isdigit() else 0 - self.packets = int(fields[4].strip()) if fields[4].strip().isdigit() else 0 + self.power = int(fields[3].strip()) + self.packets = int(fields[4].strip()) self.bssid = fields[5].strip()