Ignore -1 channels, bug/crash fix, support newer tshark

This commit is contained in:
derv82
2016-01-01 02:04:10 -05:00
parent 746da03580
commit c5ffac75c5
4 changed files with 8 additions and 3 deletions

View File

@@ -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

View File

@@ -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',

View File

@@ -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

View File

@@ -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):