Print more helpful airodump failure reason PR derv82#181

Author: simonblack

wifite/tools/tshark.py

@@ -179,7 +179,12 @@ def check_for_wps_and_update_targets(capfile, targets):
         try:
             p.wait()
             lines = p.stdout()
-        except:
+        except Exception as e:
+            # Manually check for keyboard interrupt as only python 3.x throws
+            # exceptions for subprocess.wait()
+            if isinstance(e, KeyboardInterrupt):
+                raise KeyboardInterrupt
+
             # Failure is acceptable
             return
 

wifite/tools/wash.py

@@ -31,7 +31,12 @@ def check_for_wps_and_update_targets(capfile, targets):
         try:
             p.wait()
             lines = p.stdout()
-        except:
+        except Exception as e:
+            # Manually check for keyboard interrupt as only python 3.x throws
+            # exceptions for subprocess.wait()
+            if isinstance(e, KeyboardInterrupt):
+                raise KeyboardInterrupt
+
             # Failure is acceptable
             return
 
@@ -47,7 +52,9 @@ def check_for_wps_and_update_targets(capfile, targets):
                     wps_bssids.add(bssid)
                 else:
                     locked_bssids.add(bssid)
-            except:
+            except Exception as e:
+                if isinstance(e, KeyboardInterrupt):
+                    raise KeyboardInterrupt
                 pass
 
         # Update targets