From c5ffac75c568b5c7c0d75657296d531ae5b7a91c Mon Sep 17 00:00:00 2001
From: derv82 <derv82@gmail.com>
Date: Fri, 1 Jan 2016 02:04:10 -0500
Subject: [PATCH] Ignore -1 channels, bug/crash fix, support newer tshark

---
 py/Airodump.py  | 4 ++++
 py/Arguments.py | 2 +-
 py/AttackWPS.py | 2 +-
 py/Handshake.py | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/py/Airodump.py b/py/Airodump.py
index 4dcc37c..f45b344 100644
--- a/py/Airodump.py
+++ b/py/Airodump.py
@@ -195,6 +195,10 @@ class Airodump(object):
                         # Ignore empty/blank ESSIDs
                         continue
 
+                    if target.channel == "-1":
+                        # Ignore -1 channel
+                        continue
+
                     targets.append(target)
         return targets
 
diff --git a/py/Arguments.py b/py/Arguments.py
index a8b1dac..cf8f864 100644
--- a/py/Arguments.py
+++ b/py/Arguments.py
@@ -74,7 +74,7 @@ class Arguments(object):
             dest='wep_timeout',
             metavar='[seconds]',
             type=int,
-            help=Color.s('Seconds to wait before failing (default: {G}%d ivs{W})')
+            help=Color.s('Seconds to wait before failing (default: {G}%d sec{W})')
                 % Configuration.wep_timeout)
         wep.add_argument('-wepc',
             action='store',
diff --git a/py/AttackWPS.py b/py/AttackWPS.py
index 4e4f6cf..a05a615 100644
--- a/py/AttackWPS.py
+++ b/py/AttackWPS.py
@@ -198,7 +198,7 @@ class AttackWPS(Attack):
                                             Configuration.wps_fail_threshold))
 
             if failures >= Configuration.wps_fail_threshold:
-                Color.pl('{R}failed: {O}too many failures{W}' % failures)
+                Color.pl('{R}failed: {O}too many failures{W}')
                 break
                 
             # Get output
diff --git a/py/Handshake.py b/py/Handshake.py
index 0176d5c..144546e 100644
--- a/py/Handshake.py
+++ b/py/Handshake.py
@@ -120,7 +120,8 @@ class Handshake(object):
             'tshark',
             '-r', self.capfile,
             '-R', 'eapol',
-            '-n'
+            '-n',
+            '-2' # 2-pass filtering, required when using -R in newer versions of tshark
         ]
 
     def tshark_handshakes(self):