Slight adjustments to format of printed information.

This commit is contained in:
derv82
2018-03-10 20:36:50 -05:00
parent a50d633861
commit e95b4a99a0
2 changed files with 8 additions and 9 deletions

View File

@@ -272,11 +272,11 @@ class Airmon(object):
if proc.poll() != 0: if proc.poll() != 0:
Color.pl(" {R}Error executing {O}%s{W}" % cmd) Color.pl(" {R}Error executing {O}%s{W}" % cmd)
if out is not None and out.strip() != "": if out is not None and out.strip() != "":
Color.pl(" {O}STDOUT> %s{W}" % out) Color.pl("{!} {O}STDOUT> %s{W}" % out)
if err is not None and err.strip() != "": if err is not None and err.strip() != "":
Color.pl(" {O}STDERR> %s{W}" % err) Color.pl("{!} {O}STDERR> %s{W}" % err)
else: else:
Color.pl(" {GR}restarted{W} ({C}%s{W})" % cmd) Color.pl(" {G}done{W} ({C}%s{W})" % cmd)
return return
if Process.exists('systemctl'): if Process.exists('systemctl'):
@@ -286,11 +286,11 @@ class Airmon(object):
if proc.poll() != 0: if proc.poll() != 0:
Color.pl(" {R}Error executing {O}%s{W}" % cmd) Color.pl(" {R}Error executing {O}%s{W}" % cmd)
if out is not None and out.strip() != "": if out is not None and out.strip() != "":
Color.pl(" {O}STDOUT> %s{W}" % out) Color.pl("{!} {O}STDOUT> %s{W}" % out)
if err is not None and err.strip() != "": if err is not None and err.strip() != "":
Color.pl(" {O}STDERR> %s{W}" % err) Color.pl("{!} {O}STDERR> %s{W}" % err)
else: else:
Color.pl(" {GR}restarted{W} ({C}%s{W})" % cmd) Color.pl(" {G}done{W} ({C}%s{W})" % cmd)
return return
else: else:
Color.pl(" {R}can't restart NetworkManager: {O}systemctl{R} or {O}service{R} not found{W}") Color.pl(" {R}can't restart NetworkManager: {O}systemctl{R} or {O}service{R} not found{W}")

View File

@@ -95,7 +95,7 @@ class AttackWEP(Attack):
Color.clear_entire_line() Color.clear_entire_line()
Color.pattack("WEP", Color.pattack("WEP",
airodump_target, airodump_target,
"%s attack" % attack_name, "%s" % attack_name,
status) status)
#self.aircrack_check() #self.aircrack_check()
@@ -159,8 +159,7 @@ class AttackWEP(Attack):
xor_file = Aireplay.get_xor() xor_file = Aireplay.get_xor()
if not xor_file: if not xor_file:
# If .xor is not there, the process failed. # If .xor is not there, the process failed.
Color.pl('\n{!} {O}%s attack{R} did not generate' % attack_name + Color.pl('\n{!} {O}%s attack{R} did not generate a .xor file' % attack_name)
' a .xor file{W}')
# XXX: For debugging # XXX: For debugging
Color.pl('{?} {O}Command: {R}%s{W}' % aireplay.cmd) Color.pl('{?} {O}Command: {R}%s{W}' % aireplay.cmd)
Color.pl('{?} {O}Output:\n{R}%s{W}' % aireplay.get_output()) Color.pl('{?} {O}Output:\n{R}%s{W}' % aireplay.get_output())