From 64e2c44e17975193ef36dc8e7ed1f48219a6a436 Mon Sep 17 00:00:00 2001 From: derv82 Date: Fri, 5 Jun 2015 05:47:23 -0700 Subject: [PATCH] Detect wireless interface when necesary --- Wifite.py | 1 + py/Arguments.py | 2 -- py/Configuration.py | 10 ++++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Wifite.py b/Wifite.py index bb6bfcc..9aae964 100755 --- a/Wifite.py +++ b/Wifite.py @@ -37,6 +37,7 @@ class Wifite(object): Color.pl('{!} Unimplemented method: update') pass else: + Configuration.get_interface() self.run() def display_cracked(self): diff --git a/py/Arguments.py b/py/Arguments.py index 934ffb0..16beb35 100644 --- a/py/Arguments.py +++ b/py/Arguments.py @@ -241,9 +241,7 @@ if __name__ == '__main__': from Configuration import Configuration Configuration.initialize(False) a = Arguments(Configuration) - ''' args = a.args for (key,value) in sorted(args.__dict__.iteritems()): Color.pl('{C}%s: {G}%s{W}' % (key.ljust(21),value)) - ''' diff --git a/py/Configuration.py b/py/Configuration.py index 2251238..08a38f2 100644 --- a/py/Configuration.py +++ b/py/Configuration.py @@ -84,7 +84,13 @@ class Configuration(object): # Overwrite config values with arguments (if defined) Configuration.load_from_arguments() - if load_interface and Configuration.interface == None: + if load_interface: + Configuration.get_interface() + + + @staticmethod + def get_interface(): + if Configuration.interface == None: # Interface wasn't defined, select it! from Airmon import Airmon Configuration.interface = Airmon.ask() @@ -285,6 +291,6 @@ class Configuration(object): return result if __name__ == '__main__': - Configuration.initialize() + Configuration.initialize(False) print Configuration.dump()