Merge branch 'k4m4-master'

This commit is contained in:
xdavidhu 2017-02-03 10:54:28 +01:00
commit 32842f5b2b
2 changed files with 12 additions and 19 deletions

View File

@ -32,7 +32,7 @@ If you would like to install KickThemOut on a Mac, please run the following::
$ brew install libdnet scapy $ brew install libdnet scapy
Keep in mind that you might be asked to run some commands after executing the previous step. Moving on:: **Keep in mind** that you might be asked to run some commands after executing the previous step. Moving on::
$ git clone https://github.com/k4m4/kickthemout.git $ git clone https://github.com/k4m4/kickthemout.git

View File

@ -69,7 +69,12 @@ def regenOnlineIPs():
def scanNetwork(): def scanNetwork():
global hostsList global hostsList
try:
hostsList = scan.scanNetwork() hostsList = scan.scanNetwork()
except:
print("\n{0}ERROR: Network scanning failed. Please check your requirements configuration.{1}\n").format(RED, END)
raise SystemExit
regenOnlineIPs() regenOnlineIPs()
def kickoneoff(): def kickoneoff():
@ -260,24 +265,12 @@ def getDefaultInterfaceMAC():
getDefaultInterfaceMACManually = False getDefaultInterfaceMACManually = False
try: try:
defaultInterfaceMac = get_if_hwaddr(defaultInterface) defaultInterfaceMac = get_if_hwaddr(defaultInterface)
if defaultInterfaceMac == "" or not defaultInterfaceMac:
getDefaultInterfaceMACManually = True
else:
return defaultInterfaceMac return defaultInterfaceMac
except: except:
getDefaultInterfaceMACManually = True print("\n{0}ERROR: Default Interface MAC Address could not be obtained. Please enter MAC manually.{1}\n").format(RED, END)
header = ('{0}kickthemout{1}> {2}Enter MAC Address {3}(MM:MM:MM:SS:SS:SS): '.format(BLUE, WHITE, RED, END))
if getDefaultInterfaceMACManually:
print("\n{0}{1}ERROR: Your Default Interface's ({2}" + defaultInterface + "{3}) MAC Address could not be obtained.\n\tPlease enter it manually.{4}\n").format(GREEN, RED, GREEN, RED, END)
header = ("{0}kickthemout{1}> {2}{3}{4}'s MAC Address {5}(MM:MM:MM:SS:SS:SS): ".format(BLUE, WHITE, GREEN, defaultInterface, RED, END))
try:
defaultInterfaceMac = raw_input(header) defaultInterfaceMac = raw_input(header)
return defaultInterfaceMac return defaultInterfaceMac
except KeyboardInterrupt:
print('\n\n{0}Thanks for dropping by.'
'\nCatch ya later!{1}').format(GREEN, END)
raise SystemExit
def resolveMac(mac): def resolveMac(mac):
try: try: