Auto-cleanup-on-shutdown output is consistent.
This commit is contained in:
@@ -185,6 +185,6 @@ if __name__ == '__main__':
|
|||||||
Color.pl(err)
|
Color.pl(err)
|
||||||
Color.pl('\n{!} {R}Exiting{W}\n')
|
Color.pl('\n{!} {R}Exiting{W}\n')
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
Color.pl('\n{!} {O}interrupted{W}')
|
Color.pl('\n{!} {O}interrupted, shutting down...{W}')
|
||||||
Configuration.exit_gracefully(0)
|
Configuration.exit_gracefully(0)
|
||||||
|
|
||||||
|
|||||||
11
py/Airmon.py
11
py/Airmon.py
@@ -113,7 +113,7 @@ class Airmon(object):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def stop(iface):
|
def stop(iface):
|
||||||
Color.p("{+} {R}disabling {O}monitor mode{R} on {O}%s{W}... " % iface)
|
Color.p("{!} {R}disabling {O}monitor mode{O} on {R}%s{O}... " % iface)
|
||||||
(out,err) = Process.call('airmon-ng stop %s' % iface)
|
(out,err) = Process.call('airmon-ng stop %s' % iface)
|
||||||
mon_iface = None
|
mon_iface = None
|
||||||
for line in out.split('\n'):
|
for line in out.split('\n'):
|
||||||
@@ -133,7 +133,7 @@ class Airmon(object):
|
|||||||
break
|
break
|
||||||
|
|
||||||
if mon_iface:
|
if mon_iface:
|
||||||
Color.pl('{R}disabled {O}%s{W}' % mon_iface)
|
Color.pl('{R}disabled %s{W}' % mon_iface)
|
||||||
else:
|
else:
|
||||||
Color.pl('{O}could not disable on {R}%s{W}' % iface)
|
Color.pl('{O}could not disable on {R}%s{W}' % iface)
|
||||||
|
|
||||||
@@ -252,15 +252,16 @@ class Airmon(object):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def put_interfaces_up():
|
def put_interfaces_up():
|
||||||
Color.pl("{+} {O}Putting interfaces up...")
|
|
||||||
for interface in Airmon.get_interfaces():
|
for interface in Airmon.get_interfaces():
|
||||||
Color.pl("{+} {B}up into {O}%s" %(interface.name))
|
Color.p("{!} {O}putting interface {R}%s up{O}..." %(interface.name))
|
||||||
(out,err) = Process.call('ifconfig %s up' %(interface.name))
|
(out,err) = Process.call('ifconfig %s up' %(interface.name))
|
||||||
|
Color.pl(" {R}done{W}")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def start_network_manager():
|
def start_network_manager():
|
||||||
Color.pl("{+} {O}Starting NetworkManager")
|
Color.p("{!} {O}Restarting {R}NetworkManager{O}...")
|
||||||
(out,err) = Process.call('systemctl start NetworkManager')
|
(out,err) = Process.call('systemctl start NetworkManager')
|
||||||
|
Color.pl(" {R}restarted{W}")
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
Airmon.terminate_conflicting_processes()
|
Airmon.terminate_conflicting_processes()
|
||||||
|
|||||||
@@ -289,9 +289,10 @@ class Configuration(object):
|
|||||||
Configuration.delete_temp()
|
Configuration.delete_temp()
|
||||||
Macchanger.reset_if_changed()
|
Macchanger.reset_if_changed()
|
||||||
from Airmon import Airmon
|
from Airmon import Airmon
|
||||||
Airmon.stop(Configuration.interface)
|
if Configuration.interface is not None:
|
||||||
Airmon.put_interfaces_up()
|
Airmon.stop(Configuration.interface)
|
||||||
Airmon.start_network_manager()
|
Airmon.put_interfaces_up()
|
||||||
|
Airmon.start_network_manager()
|
||||||
exit(code)
|
exit(code)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user