Fix bug when airodump output for clients is unexpected/unparsable

derv82 · May 18, 2017 · c812edf · c812edf
1 parent c4773c6
commit c812edf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/py/Airodump.py b/py/Airodump.py
@@ -195,7 +195,7 @@ def get_targets_from_csv(csv_filename):
                     # 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
@@ -170,6 +170,12 @@ def parse_line(self, line):
         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
@@ -22,8 +22,8 @@ def __init__(self, fields):
                     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()